- refactored barrier header, fixed messages for barrier signaling

5 files changed, 19 insertions, 68 deletions

diff --git a/src/transport/test_transport_plugin_cmd_nat_upnp.c b/src/transport/test_transport_plugin_cmd_nat_upnp.c
index 3fef41d87..b02673d04 100644
--- a/src/transport/test_transport_plugin_cmd_nat_upnp.c
+++ b/src/transport/test_transport_plugin_cmd_nat_upnp.c
@@ -24,7 +24,7 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_ng_lib.h"
+#include "gnunet_testing_barrier.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_application_service.h"
@@ -95,13 +95,15 @@ get_waiting_for_barriers ()
 
   barriers = GNUNET_new (struct GNUNET_TESTING_BarrierList);
   ble = GNUNET_new (struct GNUNET_TESTING_BarrierListEntry);
-  ble->barrier = GNUNET_TESTING_barrier_new ("ready-to-connect");
+  ble->barrier_name = "ready-to-connect";
+  ble->expected_reaches = 1;
   GNUNET_CONTAINER_DLL_insert (barriers->head,
                                barriers->tail,
                                ble);
 
   ble = GNUNET_new (struct GNUNET_TESTING_BarrierListEntry);
-  ble->barrier = GNUNET_TESTING_barrier_new ("test-case-finished");
+  ble->barrier_name = "test-case-finished";
+  ble->expected_reaches = 1;
   GNUNET_CONTAINER_DLL_insert (barriers->head,
                                barriers->tail,
                                ble);
@@ -109,15 +111,6 @@ get_waiting_for_barriers ()
 }
 
 
-static void
-barrier_advanced (const char *barrier_name)
-{
-  struct GNUNET_TESTING_Barrier *barrier = GNUNET_TESTING_get_barrier (is, barrier_name);
-
-  GNUNET_TESTING_finish_attached_cmds (is, barrier);
-}
-
-
 /**
  * Callback to set the flag indicating all peers started. Will be called via the plugin api.
  *
@@ -213,7 +206,7 @@ all_local_tests_prepared ()
  * @param n The number of the network namespace.
  * @param local_m The number of nodes in a network namespace.
  */
-static void
+static struct GNUNET_TESTING_Interpreter *
 start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                 const char *router_ip,
                 const char *node_ip,
@@ -354,7 +347,7 @@ start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                       TIMEOUT,
                       &handle_result,
                       ts);
-
+  return is;
 }
 
 
@@ -377,7 +370,6 @@ libgnunet_test_transport_plugin_cmd_nat_upnp_init (void *cls)
   api->start_testcase = &start_testcase;
   api->all_peers_started = &all_peers_started;
   api->all_local_tests_prepared = all_local_tests_prepared;
-  api->barrier_advanced = barrier_advanced;
   api->get_waiting_for_barriers = get_waiting_for_barriers;
   return api;
 }
diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c
index e94667593..83f9d62b8 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -24,7 +24,7 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_ng_lib.h"
+#include "gnunet_testing_barrier.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_application_service.h"
@@ -95,15 +95,6 @@ get_waiting_for_barriers ()
 }
 
 
-static void
-barrier_advanced (const char *barrier_name)
-{
-  struct GNUNET_TESTING_Barrier *barrier = GNUNET_TESTING_get_barrier (is, barrier_name);
-
-  GNUNET_TESTING_finish_attached_cmds (is, barrier);
-}
-
-
 /**
  * Callback to set the flag indicating all peers started. Will be called via the plugin api.
  *
@@ -199,7 +190,7 @@ all_local_tests_prepared ()
  * @param n The number of the network namespace.
  * @param local_m The number of nodes in a network namespace.
  */
-static void
+static struct GNUNET_TESTING_Interpreter *
 start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                 const char *router_ip,
                 const char *node_ip,
@@ -338,7 +329,7 @@ start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                       TIMEOUT,
                       &handle_result,
                       ts);
-
+  return is;
 }
 
 
@@ -361,7 +352,6 @@ libgnunet_test_transport_plugin_cmd_simple_send_init (void *cls)
   api->start_testcase = &start_testcase;
   api->all_peers_started = &all_peers_started;
   api->all_local_tests_prepared = all_local_tests_prepared;
-  api->barrier_advanced = barrier_advanced;
   api->get_waiting_for_barriers = get_waiting_for_barriers;
   return api;
 }
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
index 4eeb25ec8..9f028e260 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
@@ -24,7 +24,7 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_ng_lib.h"
+#include "gnunet_testing_barrier.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_application_service.h"
@@ -95,15 +95,6 @@ get_waiting_for_barriers ()
 }
 
 
-static void
-barrier_advanced (const char *barrier_name)
-{
-  struct GNUNET_TESTING_Barrier *barrier = GNUNET_TESTING_get_barrier (is, barrier_name);
-
-  GNUNET_TESTING_finish_attached_cmds (is, barrier);
-}
-
-
 /**
  * Callback to set the flag indicating all peers started. Will be called via the plugin api.
  *
@@ -232,7 +223,7 @@ all_local_tests_prepared ()
  * @param n The number of the network namespace.
  * @param local_m The number of nodes in a network namespace.
  */
-static void
+static struct GNUNET_TESTING_Interpreter *
 start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                 const char *router_ip,
                 const char *node_ip,
@@ -365,7 +356,7 @@ start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                       TIMEOUT,
                       &handle_result,
                       ts);
-
+  return is;
 }
 
 
@@ -388,7 +379,6 @@ libgnunet_test_transport_plugin_cmd_simple_send_broadcast_init (void *cls)
   api->start_testcase = &start_testcase;
   api->all_peers_started = &all_peers_started;
   api->all_local_tests_prepared = all_local_tests_prepared;
-  api->barrier_advanced = barrier_advanced;
   api->get_waiting_for_barriers = get_waiting_for_barriers;
   return api;
 }
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_dv.c b/src/transport/test_transport_plugin_cmd_simple_send_dv.c
index fe2c04401..3f4ae735c 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_dv.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_dv.c
@@ -24,7 +24,7 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_ng_lib.h"
+#include "gnunet_testing_barrier.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_application_service.h"
@@ -147,15 +147,6 @@ get_waiting_for_barriers ()
 }
 
 
-static void
-barrier_advanced (const char *barrier_name)
-{
-  struct GNUNET_TESTING_Barrier *barrier = GNUNET_TESTING_get_barrier (is, barrier_name);
-
-  GNUNET_TESTING_finish_attached_cmds (is, barrier);
-}
-
-
 /**
  * Callback to set the flag indicating all peers started. Will be called via the plugin api.
  *
@@ -255,7 +246,7 @@ all_local_tests_prepared ()
  * @param n The number of the network namespace.
  * @param local_m The number of nodes in a network namespace.
  */
-static void
+static struct GNUNET_TESTING_Interpreter *
 start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                 const char *router_ip,
                 const char *node_ip,
@@ -393,7 +384,7 @@ start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                       TIMEOUT,
                       &handle_result,
                       ts);
-
+  return is;
 }
 
 
@@ -416,7 +407,6 @@ libgnunet_test_transport_plugin_cmd_simple_send_dv_init (void *cls)
   api->start_testcase = &start_testcase;
   api->all_peers_started = &all_peers_started;
   api->all_local_tests_prepared = all_local_tests_prepared;
-  api->barrier_advanced = barrier_advanced;
   api->get_waiting_for_barriers = get_waiting_for_barriers;
   return api;
 }
diff --git a/src/transport/test_transport_plugin_cmd_udp_backchannel.c b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
index f96a25e80..524250590 100644
--- a/src/transport/test_transport_plugin_cmd_udp_backchannel.c
+++ b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
@@ -24,7 +24,7 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_ng_lib.h"
+#include "gnunet_testing_barrier.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_application_service.h"
@@ -93,16 +93,6 @@ get_waiting_for_barriers ()
 }
 
 
-static void
-barrier_advanced (const char *barrier_name)
-{
-  struct GNUNET_TESTING_Barrier *barrier = GNUNET_TESTING_get_barrier (is,
-                                                                       barrier_name);
-
-  GNUNET_TESTING_finish_attached_cmds (is, barrier);
-}
-
-
 /**
  * Callback to set the flag indicating all peers started. Will be called via the plugin api.
  *
@@ -193,7 +183,7 @@ all_local_tests_prepared ()
  * @param n The number of the network namespace.
  * @param local_m The number of nodes in a network namespace.
  */
-static void
+static struct GNUNET_TESTING_Interpreter *
 start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                 const char *router_ip,
                 const char *node_ip,
@@ -331,7 +321,7 @@ start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                            TIMEOUT,
                            &handle_result,
                            ts);
-
+  return is;
 }
 
 
@@ -354,7 +344,6 @@ libgnunet_test_transport_plugin_cmd_udp_backchannel_init (void *cls)
   api->start_testcase = &start_testcase;
   api->all_peers_started = &all_peers_started;
   api->all_local_tests_prepared = all_local_tests_prepared;
-  api->barrier_advanced = barrier_advanced;
   api->get_waiting_for_barriers = get_waiting_for_barriers;
   return api;
 }