new operation queue for limiting overlay connects

[oweals/gnunet.git] / src / transport / gnunet-transport.c

diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index d0a1358060cb0657c97efe7a2e9968e39ea806cf..5978de6bbc30d014c1373a3ffa3432ccfc1252c0 100644 (file)
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -284,7 +284,7 @@ do_test_configuration (const struct GNUNET_CONFIGURATION_Handle *cfg)
       adv_port = bnd_port;
     if (NULL == resolver)
       resolver =
-         GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-resolver",
+         GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-service-resolver",
                                    "gnunet-service-resolver", NULL);
     resolver_users++;
     GNUNET_RESOLVER_connect (cfg);
@@ -325,16 +325,17 @@ do_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (benchmark_receive)
   {
     duration = GNUNET_TIME_absolute_get_duration (start_time);
-    FPRINTF (stdout, _("Received %llu bytes/s (%llu bytes in %llu ms)\n"),
+    FPRINTF (stdout, _("Received %llu bytes/s (%llu bytes in %s)\n"),
              1000 * traffic_received / (1 + duration.rel_value),
-             traffic_received, (unsigned long long) duration.rel_value);
+             traffic_received,
+            GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
   }
   if (benchmark_send)
   {
     duration = GNUNET_TIME_absolute_get_duration (start_time);
-    FPRINTF (stdout, _("Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"),
+    FPRINTF (stdout, _("Transmitted %llu bytes/s (%llu bytes in %s)\n"),
              1000 * traffic_sent / (1 + duration.rel_value), traffic_sent,
-             (unsigned long long) duration.rel_value);
+             GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
   }
 }
 
@@ -355,6 +356,12 @@ transmit_data (void *cls, size_t size, void *buf)
 {
   struct GNUNET_MessageHeader *m = buf;
 
+  if ((NULL == buf) && (0 == size))
+  {
+    th = NULL;
+    return 0;
+  }
+
   GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
   GNUNET_assert (size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
   m->size = ntohs (size);
@@ -392,7 +399,8 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
   if (benchmark_send)
   {
     start_time = GNUNET_TIME_absolute_get ();
-    th = GNUNET_TRANSPORT_notify_transmit_ready (handle, peer, 32 * 1024, 0,
+    if (NULL == th)
+      th = GNUNET_TRANSPORT_notify_transmit_ready (handle, peer, 32 * 1024, 0,
                                                  GNUNET_TIME_UNIT_FOREVER_REL,
                                                  &transmit_data, NULL);
   }
@@ -417,6 +425,12 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   if (verbosity > 0)
     FPRINTF (stdout, _("Disconnected from %s\n"), GNUNET_i2s (peer));
+  if (NULL != th)
+  {
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+    th = NULL;
+  }
+
 }
 
 /**
@@ -434,14 +448,13 @@ monitor_notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
 {
   monitor_connections_counter ++;
   struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get();
-  char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
+  const char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
+
   FPRINTF (stdout, _("%24s: %-17s %4s   (%u connections in total)\n"),
            now_str,
            _("Connected to"),
            GNUNET_i2s (peer),
            monitor_connections_counter);
-
-  GNUNET_free (now_str);
 }
 
 
@@ -456,7 +469,7 @@ static void
 monitor_notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get();
-  char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
+  const char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
 
   GNUNET_assert (monitor_connections_counter > 0);
   monitor_connections_counter --;
@@ -466,7 +479,6 @@ monitor_notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
            _("Disconnected from"),
            GNUNET_i2s (peer),
            monitor_connections_counter);
-  GNUNET_free (now_str);
 }
 
 
@@ -487,6 +499,8 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
 {
   if (!benchmark_receive)
     return;
+  if (GNUNET_MESSAGE_TYPE_DUMMY != ntohs (message->type))
+    return;
   if (verbosity > 0)
     FPRINTF (stdout, _("Received %u bytes from %s\n"),
              (unsigned int) ntohs (message->size), GNUNET_i2s (peer));
@@ -574,6 +588,11 @@ static void
 shutdown_task (void *cls,
               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  if (NULL != th)
+  {
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel(th);
+    th = NULL;
+  }
   if (NULL != handle)
   {
     GNUNET_TRANSPORT_disconnect(handle);
@@ -587,24 +606,18 @@ shutdown_task (void *cls,
   }
 }
 
-
-
-/**
- * Main function that will be run by the scheduler.
- *
- * @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
- */
 static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+testservice_task (void *cls,
+                  const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (test_configuration)
+  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
   {
-    do_test_configuration (cfg);
+      FPRINTF (stderr, _("Service `%s' is not running\n"), "transport");
+      return;
   }
+
   if (benchmark_send && (NULL == cpid))
   {
     FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
@@ -635,13 +648,14 @@ run (void *cls, char *const *args, const char *cfgfile,
         GNUNET_TRANSPORT_connect (cfg, NULL, NULL, &notify_receive,
                                   &notify_connect, &notify_disconnect);
     GNUNET_TRANSPORT_try_connect (handle, &pid);
+    start_time = GNUNET_TIME_absolute_get ();
     end =
         GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                       &do_disconnect, NULL);
   }
   if (iterate_connections)
   {
-    peers = GNUNET_CONTAINER_multihashmap_create (20);
+    peers = GNUNET_CONTAINER_multihashmap_create (20, GNUNET_NO);
     GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL, GNUNET_YES,
                                                 TIMEOUT,
                                                 &process_address, (void *) cfg);
@@ -663,6 +677,32 @@ run (void *cls, char *const *args, const char *cfgfile,
                                     NULL);
     }
   }
+
+
+}
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfg configuration
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  if (test_configuration)
+  {
+    do_test_configuration (cfg);
+  }
+
+  GNUNET_CLIENT_service_test ("transport", cfg,
+      GNUNET_TIME_UNIT_SECONDS,
+      &testservice_task,
+      (void *) cfg);
 }