- fix memleaks

5 files changed, 29 insertions, 5 deletions

diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index c60b8227e..471ab3a94 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -181,7 +181,12 @@ enum Stage
   SLAVE3_LINK_SUCCESS,
 
   /**
-   * Destory master peer and mark test as success
+   * Master peer destoryed.  Destory slave 3 peer
+   */
+  MASTER_PEER_DESTROY_SUCCESS,
+
+  /**
+   * Slave 3 peer destroyed.  Mark test as success
    */
   SUCCESS,
 
@@ -631,6 +636,11 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     break;
   case SLAVE3_LINK_SUCCESS:
     check_operation_success (event);
+    result = MASTER_PEER_DESTROY_SUCCESS;
+    GNUNET_TESTBED_operation_done (op);
+    op = GNUNET_TESTBED_peer_destroy (slave3_peer);
+    break;
+  case MASTER_PEER_DESTROY_SUCCESS:
     result = SUCCESS;
     GNUNET_TESTBED_operation_done (op);
     op = NULL;
diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c
index bc01f6bc8..463dc736e 100644
--- a/src/testbed/test_testbed_api_statistics.c
+++ b/src/testbed/test_testbed_api_statistics.c
@@ -59,6 +59,17 @@ static GNUNET_SCHEDULER_TaskIdentifier abort_task;
 static int result;
 
 /**
+ * The peers we have seen in the statistics iterator
+ */
+static struct GNUNET_TESTBED_Peer **seen_peers;
+
+/**
+ * Number of peers in the above array
+ */
+static unsigned int num_seen_peers;
+
+
+/**
  * Fail testcase
  */
 #define FAIL_TEST(cond, ret) do {                               \
@@ -109,8 +120,6 @@ stats_iterator (void *cls,
                 const char *subsystem, const char *name, uint64_t value,
                 int is_persistent)
 {
-  static struct GNUNET_TESTBED_Peer **seen_peers;
-  static unsigned int num_seen_peers;
   unsigned int cnt;
     
   FAIL_TEST (cls == dummy_cls, return GNUNET_SYSERR);
@@ -187,6 +196,7 @@ main (int argc, char **argv)
                                   NUM_PEERS,
                                   1LL, NULL, NULL,
                                   &test_master, NULL);
+  GNUNET_free_non_null (seen_peers);
   if (GNUNET_OK != result)
     return 1;
   return 0;
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c
index 4933f4793..e8f1c55be 100644
--- a/src/testbed/test_testbed_api_topology.c
+++ b/src/testbed/test_testbed_api_topology.c
@@ -94,7 +94,8 @@ controller_event_cb (void *cls,
     if ((NUM_PEERS) == overlay_connects)
     {
       result = GNUNET_OK;
-      GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+      GNUNET_SCHEDULER_cancel (shutdown_task);
+      shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
     }
     break;
   case GNUNET_TESTBED_ET_OPERATION_FINISHED:
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c
index 7b8c802a0..30cce6c0d 100644
--- a/src/testbed/test_testbed_api_topology_clique.c
+++ b/src/testbed/test_testbed_api_topology_clique.c
@@ -94,7 +94,8 @@ controller_event_cb (void *cls,
     if ((NUM_PEERS * (NUM_PEERS - 1)) == overlay_connects)
     {
       result = GNUNET_OK;
-      GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+      GNUNET_SCHEDULER_cancel (shutdown_task);
+      shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
     }
     break;
   case GNUNET_TESTBED_ET_OPERATION_FINISHED:
diff --git a/src/testbed/test_testbed_logger_api.c b/src/testbed/test_testbed_logger_api.c
index bbc9e33d2..a8ed3d22c 100644
--- a/src/testbed/test_testbed_logger_api.c
+++ b/src/testbed/test_testbed_logger_api.c
@@ -90,6 +90,8 @@ shutdown_now ()
   CANCEL_TASK (abort_task);
   CANCEL_TASK (write_task);
   GNUNET_free_non_null (search_dir);
+  if (NULL != h)
+    GNUNET_TESTBED_LOGGER_disconnect (h);
   GNUNET_SCHEDULER_shutdown ();
 }