[GNUnet-SVN] r29133 - in gnunet: . src/arm src/fs

[gnunet]

Author: grothoff
Date: 2013-09-09 15:23:36 +0200 (Mon, 09 Sep 2013)
New Revision: 29133

Modified:
   gnunet/configure.ac
   gnunet/src/arm/arm.conf.in
   gnunet/src/fs/fs.conf.in
   gnunet/src/fs/gnunet-download.c
Log:
-monkey integration

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-09-09 13:19:00 UTC (rev 29132)
+++ gnunet/configure.ac 2013-09-09 13:23:36 UTC (rev 29133)
@@ -1060,7 +1060,7 @@
 AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"])
 if test "x$enable_monkey" = "xyes"
 then
-  MONKEYPREFIX="monkey"
+  MONKEYPREFIX="pathologist -d $(eval echo 
${datarootdir}/gnunet/gnunet.sqlite) -p 30 --"
 else
   MONKEYPREFIX=""
 fi

Modified: gnunet/src/arm/arm.conf.in
===================================================================
--- gnunet/src/arm/arm.conf.in  2013-09-09 13:19:00 UTC (rev 29132)
+++ gnunet/src/arm/arm.conf.in  2013-09-09 13:23:36 UTC (rev 29133)
@@ -17,7 +17,7 @@
 # logging with a new log file each day.  Note that only the last 3
 # log files are preserved.
 # GLOBAL_POSTFIX = -l $SERVICEHOME/{}-%Y-%m-%d.log
-# GLOBAL_PREFIX =
+GLOBAL_PREFIX = @MONKEYPREFIX@
 # USERNAME =
 # MAXBUF =
 # TIMEOUT =

Modified: gnunet/src/fs/fs.conf.in
===================================================================
--- gnunet/src/fs/fs.conf.in    2013-09-09 13:19:00 UTC (rev 29132)
+++ gnunet/src/fs/fs.conf.in    2013-09-09 13:23:36 UTC (rev 29133)
@@ -47,9 +47,6 @@
 # For how many neighbouring peers should we allocate hash maps?
 EXPECTED_NEIGHBOUR_COUNT = 128
 
-# Enable monkey?
-# PREFIX = @MONKEYPREFIX@
-
 # Disable anonymous file-sharing (but keep non-anonymous transfers)?
 # This option is mostly for testing.
 DISABLE_ANON_TRANSFER = NO

Modified: gnunet/src/fs/gnunet-download.c
===================================================================
--- gnunet/src/fs/gnunet-download.c     2013-09-09 13:19:00 UTC (rev 29132)
+++ gnunet/src/fs/gnunet-download.c     2013-09-09 13:23:36 UTC (rev 29133)
@@ -121,7 +121,7 @@
  *         for this operation; should be set to NULL for
  *         SUSPEND and STOPPED events).  The value returned
  *         will be passed to future callbacks in the respective
- *         field in the GNUNET_FS_ProgressInfo struct.
+ *         field in the `struct GNUNET_FS_ProgressInfo`
  */
 static void *
 progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)