arg

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

diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c
index caeabedd55f58fc6a0d337cfe436f09ea0dc9ba4..572585520610ac410c2a047adcb67ef23530337d 100644 (file)
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/fs/perf_gnunet_service_fs_p2p.c
@@ -45,8 +45,6 @@
 
 static struct GNUNET_FS_TestDaemon *daemons[NUM_DAEMONS];
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static int ok;
 
 static struct GNUNET_TIME_Absolute start_time;
@@ -57,8 +55,7 @@ static void
 do_stop (void *cls,
         const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_FS_TEST_daemons_stop (sched,
-                              NUM_DAEMONS,
+  GNUNET_FS_TEST_daemons_stop (NUM_DAEMONS,
                               daemons);
 }
 
@@ -84,6 +81,7 @@ struct StatValues
  */
 static struct StatValues stats[] =
   {
+    { "fs", "# artificial delays introduced (ms)"},
     { "fs", "# queries forwarded"},
     { "fs", "# replies received and matched"},
     { "fs", "# results found locally"},
@@ -96,9 +94,12 @@ static struct StatValues stats[] =
     { "fs", "# P2P searches discarded (queue length bound)"},
     { "fs", "# replies received for local clients"},
     { "fs", "# queries retransmitted to same target"},
-    { "fs", "cummulative artificial delay introduced (ms)"},
     { "core", "# bytes decrypted"},
     { "core", "# bytes encrypted"},
+    { "core", "# discarded CORE_SEND requests"},
+    { "core", "# discarded CORE_SEND request bytes"},
+    { "core", "# discarded lower priority CORE_SEND requests"},
+    { "core", "# discarded lower priority CORE_SEND request bytes"},
     { "transport", "# bytes received via TCP"},
     { "transport", "# bytes transmitted via TCP"},
     { "datacache", "# bytes stored"},
@@ -152,7 +153,7 @@ get_done (void *cls,
   struct StatMaster *sm = cls;
   GNUNET_break (GNUNET_OK ==  success);
   sm->value++;
-  GNUNET_SCHEDULER_add_now (sched, &stat_run, sm);
+  GNUNET_SCHEDULER_add_now (&stat_run, sm);
 }
 
 
@@ -185,13 +186,13 @@ stat_run (void *cls,
   if (sm->daemon == NUM_DAEMONS)
     {
       GNUNET_free (sm);
-      GNUNET_SCHEDULER_add_now (sched, &do_stop, NULL);
+      GNUNET_SCHEDULER_add_now (&do_stop, NULL);
       return;
     }
-  sm->stat = GNUNET_STATISTICS_create (sched, "<driver>", 
+  sm->stat = GNUNET_STATISTICS_create ("<driver>",
                                       GNUNET_FS_TEST_get_configuration (daemons,
                                                                         sm->daemon));
-  GNUNET_SCHEDULER_add_now (sched, &stat_run, sm);
+  GNUNET_SCHEDULER_add_now (&stat_run, sm);
 }
 
 
@@ -206,9 +207,9 @@ do_report (void *cls,
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
     {
       del = GNUNET_TIME_absolute_get_duration (start_time);
-      if (del.value == 0)
-       del.value = 1;
-      fancy = GNUNET_STRINGS_byte_size_fancy (((unsigned long long)FILESIZE) * 1000LL / del.value);
+      if (del.rel_value == 0)
+       del.rel_value = 1;
+      fancy = GNUNET_STRINGS_byte_size_fancy (((unsigned long long)FILESIZE) * 1000LL / del.rel_value);
       fprintf (stdout,
               "Download speed was %s/s\n",
               fancy);
@@ -217,17 +218,17 @@ do_report (void *cls,
                  "Finished download, shutting down\n",
                  (unsigned long long) FILESIZE);
       sm = GNUNET_malloc (sizeof (struct StatMaster));
-      sm->stat = GNUNET_STATISTICS_create (sched, "<driver>", 
+      sm->stat = GNUNET_STATISTICS_create ("<driver>",
                                           GNUNET_FS_TEST_get_configuration (daemons,
                                                                             sm->daemon));
-      GNUNET_SCHEDULER_add_now (sched, &stat_run, sm);
+      GNUNET_SCHEDULER_add_now (&stat_run, sm);
     }
   else
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  "Timeout during download, shutting down with error\n");
       ok = 1;
-      GNUNET_SCHEDULER_add_now (sched, &do_stop, NULL);
+      GNUNET_SCHEDULER_add_now (&do_stop, NULL);
     }
 }
 
@@ -240,8 +241,7 @@ do_download (void *cls,
 
   if (NULL == uri)
     {
-      GNUNET_FS_TEST_daemons_stop (sched,
-                                  NUM_DAEMONS,
+      GNUNET_FS_TEST_daemons_stop (NUM_DAEMONS,
                                   daemons);
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  "Timeout during upload attempt, shutting down with error\n");
@@ -256,8 +256,7 @@ do_download (void *cls,
     anonymity = 0;
   else
     anonymity = 1;
-  GNUNET_FS_TEST_download (sched,
-                          daemons[0],
+  GNUNET_FS_TEST_download (daemons[0],
                           TIMEOUT,
                           anonymity, SEED, uri, 
                           VERBOSE, 
@@ -274,8 +273,7 @@ do_publish (void *cls,
 
   if (NULL != emsg)
     {
-      GNUNET_FS_TEST_daemons_stop (sched,
-                                  NUM_DAEMONS,
+      GNUNET_FS_TEST_daemons_stop (NUM_DAEMONS,
                                   daemons);
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  "Error trying to connect: %s\n",
@@ -295,8 +293,7 @@ do_publish (void *cls,
   else
     anonymity = 1;
   
-  GNUNET_FS_TEST_publish (sched,
-                         daemons[NUM_DAEMONS-1],
+  GNUNET_FS_TEST_publish (daemons[NUM_DAEMONS-1],
                          TIMEOUT,
                          anonymity, 
                          do_index, FILESIZE, SEED, 
@@ -324,6 +321,8 @@ do_connect (void *cls,
                                   GNUNET_TESTING_TOPOLOGY_LINE,                                   
                                   GNUNET_TESTING_TOPOLOGY_OPTION_NONE,
                                   0.0,
+                                  TIMEOUT,
+                                  NUM_DAEMONS,
                                   &do_publish,
                                   NULL);
 }
@@ -331,14 +330,11 @@ do_connect (void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  sched = s;
-  GNUNET_FS_TEST_daemons_start (sched,
-                               "fs_test_lib_data.conf",
+  GNUNET_FS_TEST_daemons_start ("fs_test_lib_data.conf",
                                TIMEOUT,
                                NUM_DAEMONS,
                                daemons,
@@ -378,4 +374,4 @@ main (int argc, char *argv[])
   return ok;
 }
 
-/* end of perf_gnunet_service_fs_p2p_index.c */
+/* end of perf_gnunet_service_fs_p2p.c */