X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Fperf_gnunet_service_fs_p2p_respect.c;h=47fb0d8f3900a6be0201c2600b953dfa0df3e232;hb=cfd880578bd21f9adedba557291c903d325e93cd;hp=0a5dc057832e73fd10cad586979d4399a4bd96e1;hpb=309276a88d1e57dffbea0014dc0708726c2e9376;p=oweals%2Fgnunet.git

diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c
index 0a5dc0578..47fb0d8f3 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_respect.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -178,7 +178,7 @@ print_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
  * Function that gathers stats from all daemons.
  */
 static void
-stat_run (void *cls, 
+stat_run (void *cls,
 	  struct GNUNET_TESTBED_Operation *op,
 	  void *ca_result,
 	  const char *emsg);
@@ -202,7 +202,7 @@ get_done (void *cls, int success)
 /**
  * Adapter function called to establish a connection to
  * statistics service.
- * 
+ *
  * @param cls closure
  * @param cfg configuration of the peer to connect to; will be available until
  *          GNUNET_TESTBED_operation_done() is called on the operation returned
@@ -221,11 +221,11 @@ statistics_connect_adapter (void *cls,
 /**
  * Adapter function called to destroy a connection to
  * statistics service.
- * 
+ *
  * @param cls closure
  * @param op_result service handle returned from the connect adapter
  */
-static void 
+static void
 statistics_disconnect_adapter (void *cls,
 			       void *op_result)
 {
@@ -237,7 +237,7 @@ statistics_disconnect_adapter (void *cls,
  * Function that gathers stats from all daemons.
  */
 static void
-stat_run (void *cls, 
+stat_run (void *cls,
 	  struct GNUNET_TESTBED_Operation *op,
 	  void *ca_result,
 	  const char *emsg)
@@ -297,18 +297,18 @@ 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)
     return;                   /* more downloads to come */
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 	      "Finished all downloads, getting statistics\n");
-  sm = GNUNET_malloc (sizeof (struct StatMaster));
+  sm = GNUNET_new (struct StatMaster);
   sm->op =
     GNUNET_TESTBED_service_connect (NULL,
 				    daemons[sm->daemon],
@@ -362,7 +362,7 @@ do_downloads (void *cls, const struct GNUNET_FS_Uri *u2,
 
 
 static void
-do_publish2 (void *cls,	     
+do_publish2 (void *cls,	
 	     const struct GNUNET_FS_Uri *u1,
 	     const char *fn)
 {
@@ -398,7 +398,7 @@ do_publish2 (void *cls,
 
 
 static void
-do_publish1 (void *cls, 
+do_publish1 (void *cls,
 	     struct GNUNET_TESTBED_Operation *op,
 	     const char *emsg)
 {
@@ -433,14 +433,17 @@ do_publish1 (void *cls,
 
 
 static void
-do_connect (void *cls, 
+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;
   unsigned int j;
- 
+
   GNUNET_assert (NUM_DAEMONS == num_peers);
   for (i=0;i<num_peers;i++)
     daemons[i] = peers[i];