[GNUnet-SVN] r23818 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2012-09-14 17:57:36 +0200 (Fri, 14 Sep 2012)
New Revision: 23818

Modified:
   gnunet/src/fs/perf_gnunet_service_fs_p2p.c
   gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c
   gnunet/src/fs/test_gnunet_service_fs_migration.c
   gnunet/src/fs/test_gnunet_service_fs_p2p.c
Log:
-fixes

Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p.c  2012-09-14 15:33:25 UTC (rev 
23817)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p.c  2012-09-14 15:57:36 UTC (rev 
23818)
@@ -302,6 +302,7 @@
   int do_index;
   int anonymity;
 
+  GNUNET_TESTBED_operation_done (op);
   if (NULL != emsg)
   {
     GNUNET_SCHEDULER_shutdown ();
@@ -348,6 +349,7 @@
 int
 main (int argc, char *argv[])
 {
+  progname = argv[0];
   GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p",
                           "perf_gnunet_service_fs_p2p.conf",
                           NUM_DAEMONS,

Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c  2012-09-14 15:33:25 UTC 
(rev 23817)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c  2012-09-14 15:57:36 UTC 
(rev 23818)
@@ -369,6 +369,7 @@
                           NULL);
 }
 
+
 static void
 do_publish1 (void *cls, 
             struct GNUNET_TESTBED_Operation *op,
@@ -378,6 +379,7 @@
   int do_index;
   int anonymity;
 
+  GNUNET_TESTBED_operation_done (op);
   if (NULL != emsg)
   {
     GNUNET_SCHEDULER_shutdown ();

Modified: gnunet/src/fs/test_gnunet_service_fs_migration.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration.c    2012-09-14 15:33:25 UTC 
(rev 23817)
+++ gnunet/src/fs/test_gnunet_service_fs_migration.c    2012-09-14 15:57:36 UTC 
(rev 23818)
@@ -52,7 +52,9 @@
 
 static struct GNUNET_TIME_Absolute start_time;
 
+static struct GNUNET_TESTBED_Operation *op;
 
+
 static void
 do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -88,6 +90,8 @@
 {
   struct GNUNET_FS_Uri *uri = cls;
 
+  GNUNET_TESTBED_operation_done (op);
+  op = NULL;
   if (NULL != emsg)
   {
     GNUNET_SCHEDULER_shutdown ();
@@ -112,7 +116,8 @@
   struct GNUNET_FS_Uri *uri = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping source peer\n");
-  GNUNET_TESTBED_peer_stop (daemons[1], &do_download, uri);
+  op = GNUNET_TESTBED_peer_stop (daemons[1], &do_download, uri);
+  GNUNET_assert (NULL != op);
 }
 
 
@@ -137,9 +142,12 @@
 
 static void
 do_publish (void *cls, 
-           struct GNUNET_TESTBED_Operation *op,
+           struct GNUNET_TESTBED_Operation *oparg,
            const char *emsg)
 {
+  GNUNET_assert (op == oparg);
+  GNUNET_TESTBED_operation_done (op);
+  op = NULL;
   if (NULL != emsg)
   {
     GNUNET_SCHEDULER_shutdown ();
@@ -168,9 +176,9 @@
     daemons[i] = peers[i];
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Daemons started, will now try to connect them\n");
-  GNUNET_TESTBED_overlay_connect (NULL,
-                                 &do_publish, NULL,
-                                 daemons[0], daemons[1]);
+  op = GNUNET_TESTBED_overlay_connect (NULL,
+                                      &do_publish, NULL,
+                                      daemons[0], daemons[1]);
 }
 
 

Modified: gnunet/src/fs/test_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_p2p.c  2012-09-14 15:33:25 UTC (rev 
23817)
+++ gnunet/src/fs/test_gnunet_service_fs_p2p.c  2012-09-14 15:57:36 UTC (rev 
23818)
@@ -48,7 +48,9 @@
 
 static struct GNUNET_TIME_Absolute start_time;
 
+static struct GNUNET_TESTBED_Operation *op;
 
+
 static void
 do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -99,9 +101,13 @@
 
 static void
 do_publish (void *cls,
-           struct GNUNET_TESTBED_Operation *op,
+           struct GNUNET_TESTBED_Operation *opret,
            const char *emsg)
 {
+  GNUNET_assert (op == opret);
+  GNUNET_TESTBED_operation_done (op);
+  op = NULL;
+
   if (NULL != emsg)
   {
     GNUNET_SCHEDULER_shutdown ();
@@ -130,9 +136,9 @@
     daemons[i] = peers[i];
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Daemons started, will now try to connect them\n");
-  GNUNET_TESTBED_overlay_connect (NULL,
-                                 &do_publish, NULL,
-                                 daemons[0], daemons[1]);
+  op = GNUNET_TESTBED_overlay_connect (NULL,
+                                      &do_publish, NULL,
+                                      daemons[0], daemons[1]);
 }