cleanup testing_group.c, fix bad shutdown in test_testing testcase

diff --git a/src/testing/test_testing.c b/src/testing/test_testing.c
index 880ecb399129f9eb9aac6069e5949b20e6d5a40f..30ad9b13d8534a1ba41d0692c014d231bc61b949 100644 (file)
--- a/src/testing/test_testing.c
+++ b/src/testing/test_testing.c
@@ -48,6 +48,17 @@ end_cb (void *cls, const char *emsg)
     }
 }
 
+
+
+void do_shutdown (void *cls,
+                  const struct GNUNET_SCHEDULER_TaskContext * tc)
+{
+  struct GNUNET_TESTING_Daemon *d = cls;
+  GNUNET_TESTING_daemon_stop (d, TIMEOUT, &end_cb, NULL, GNUNET_YES,
+                              GNUNET_NO);
+}
+
+
 static void
 my_cb (void *cls,
        const struct GNUNET_PeerIdentity *id,
@@ -59,8 +70,7 @@ my_cb (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Daemon `%s' started, will now stop it.\n", GNUNET_i2s (id));
 #endif
-  GNUNET_TESTING_daemon_stop (d, TIMEOUT, &end_cb, NULL, GNUNET_YES,
-                              GNUNET_NO);
+  GNUNET_SCHEDULER_add_now(&do_shutdown, d);
 }
 
 

diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c
index 10aa3177032d3380cb87c00c90d2394853bf4dba..14bf31bbc88b47dbd14d8658ef4c43c1bae90f6a 100644 (file)
--- a/src/testing/testing_group.c
+++ b/src/testing/testing_group.c
@@ -42,7 +42,6 @@
 
 #define TOPOLOGY_HACK GNUNET_YES
 
-#define AVOID_CONN_MALLOC GNUNET_NO
 
 /**
  * Lowest port used for GNUnet testing.  Should be high enough to not
@@ -784,12 +783,6 @@ struct GNUNET_TESTING_PeerGroup
    * Connection context for peer group.
    */
   struct ConnectTopologyContext ct_ctx;
-
-#if AVOID_CONN_MALLOC
-  struct PeerConnection working_peer_connections[200000];
-
-  unsigned int current_peer_connection;
-#endif
 };
 
 struct UpdateContext
@@ -1649,12 +1642,7 @@ add_connections(struct GNUNET_TESTING_PeerGroup *pg, unsigned int first,
   added = 0;
   if (add_first)
     {
-#if AVOID_CONN_MALLOC
-      new_first = &pg->working_peer_connections[pg->current_peer_connection];
-      pg->current_peer_connection++;
-#else
       new_first = GNUNET_malloc (sizeof (struct PeerConnection));
-#endif
       new_first->index = second;
       GNUNET_CONTAINER_DLL_insert(*first_list, *first_tail, new_first);
       pg->peers[first].num_connections++;
@@ -1663,12 +1651,7 @@ add_connections(struct GNUNET_TESTING_PeerGroup *pg, unsigned int first,
 
   if (add_second)
     {
-#if AVOID_CONN_MALLOC
-      new_second = &pg->working_peer_connections[pg->current_peer_connection];
-      pg->current_peer_connection++;
-#else
       new_second = GNUNET_malloc (sizeof (struct PeerConnection));
-#endif
       new_second->index = first;
       GNUNET_CONTAINER_DLL_insert(*second_list, *second_tail, new_second);
       pg->peers[second].num_connections++;