From 91d27e4d260d9cf49f06a9774cd139eb5ad8d565 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 14 Sep 2012 15:57:36 +0000
Subject: [PATCH] -fixes

---
 src/fs/perf_gnunet_service_fs_p2p.c         |  2 ++
 src/fs/perf_gnunet_service_fs_p2p_respect.c |  2 ++
 src/fs/test_gnunet_service_fs_migration.c   | 18 +++++++++++++-----
 src/fs/test_gnunet_service_fs_p2p.c         | 14 ++++++++++----
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c
index a7eb5ad16..76b4a2f69 100644
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/fs/perf_gnunet_service_fs_p2p.c
@@ -302,6 +302,7 @@ do_publish (void *cls,
   int do_index;
   int anonymity;
 
+  GNUNET_TESTBED_operation_done (op);
   if (NULL != emsg)
   {
     GNUNET_SCHEDULER_shutdown ();
@@ -348,6 +349,7 @@ do_connect (void *cls,
 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,
diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c
index 3030749e2..e2a6900ec 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_respect.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c
@@ -369,6 +369,7 @@ do_publish2 (void *cls,
                           NULL);
 }
 
+
 static void
 do_publish1 (void *cls, 
 	     struct GNUNET_TESTBED_Operation *op,
@@ -378,6 +379,7 @@ do_publish1 (void *cls,
   int do_index;
   int anonymity;
 
+  GNUNET_TESTBED_operation_done (op);
   if (NULL != emsg)
   {
     GNUNET_SCHEDULER_shutdown ();
diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c
index f1f2084f9..550c79c4b 100644
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -52,6 +52,8 @@ static int ok;
 
 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 @@ do_download (void *cls,
 {
   struct GNUNET_FS_Uri *uri = cls;
 
+  GNUNET_TESTBED_operation_done (op);
+  op = NULL;
   if (NULL != emsg)
   {
     GNUNET_SCHEDULER_shutdown ();
@@ -112,7 +116,8 @@ stop_source_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   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 @@ do_wait (void *cls, const struct GNUNET_FS_Uri *uri)
 
 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 @@ do_connect (void *cls,
     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]);
 }
 
 
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index df7b9604b..218f16b01 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -48,6 +48,8 @@ static int ok;
 
 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 @@ do_download (void *cls, const struct GNUNET_FS_Uri *uri)
 
 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 @@ do_connect (void *cls,
     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]);
 }
 
 
-- 
2.25.1