-monkey integration

[oweals/gnunet.git] / src / fs / perf_gnunet_service_fs_p2p_respect.c

diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c
index 0a5dc057832e73fd10cad586979d4399a4bd96e1..8790dcc75ae962a844f6e475dd5823de46d2b276 100644 (file)
--- a/src/fs/perf_gnunet_service_fs_p2p_respect.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c
@@ -297,11 +297,11 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     return;
   }
   del = GNUNET_TIME_absolute_get_duration (start_time);
-  if (del.rel_value == 0)
-    del.rel_value = 1;
+  if (del.rel_value_us == 0)
+    del.rel_value_us = 1;
   fancy =
     GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
-                                   1000LL / del.rel_value);
+                                   1000000LL / del.rel_value_us);
   FPRINTF (stderr, "Download speed of type `%s' was %s/s\n", type, fancy);
   GNUNET_free (fancy);
   if (NUM_DAEMONS != ++download_counter)
@@ -434,8 +434,11 @@ do_publish1 (void *cls,
 
 static void
 do_connect (void *cls, 
+            struct GNUNET_TESTBED_RunHandle *h,
            unsigned int num_peers,
-           struct GNUNET_TESTBED_Peer **peers)
+           struct GNUNET_TESTBED_Peer **peers,
+            unsigned int links_succeeded,
+            unsigned int links_failed)
 {
   static unsigned int coco;
   unsigned int i;