basic tests wip

diff --git a/src/transport/gnunet-communicator-unix.c b/src/transport/gnunet-communicator-unix.c
index 404bcfb7f25a0a349a031acd79cda478977b0c73..29ec087e16c46e5ed14784fbfc582c82355097ed 100644 (file)
--- a/src/transport/gnunet-communicator-unix.c
+++ b/src/transport/gnunet-communicator-unix.c
@@ -697,6 +697,7 @@ receive_complete_cb (void *cls, int success)
 {
   (void) cls;
   delivering_messages--;
+
   if (GNUNET_OK != success)
     GNUNET_STATISTICS_update (stats,
                               "# transport transmission failures",

diff --git a/src/transport/test_communicator.c b/src/transport/test_communicator.c
index 34be5d66ade6fd30329b8f2cbeb6eee06b2c4c78..d77128b09c9165f6566d508fc1b8d9b262ec5eac 100644 (file)
--- a/src/transport/test_communicator.c
+++ b/src/transport/test_communicator.c
@@ -54,14 +54,43 @@ static char **cfg_peers_name;
 
 static int ret;
 
-// static char *addresses[NUM_PEERS];
+static struct GNUNET_TIME_Absolute start_short;
 
+static struct GNUNET_TIME_Absolute start_long;
 
-#define PAYLOAD_SIZE 256
+static struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *my_tc;
 
-// static char payload[PAYLOAD_SIZE] = "TEST PAYLOAD";
-// static char payload[] = "TEST PAYLOAD";
-static uint32_t payload = 42;
+#define SHORT_MESSAGE_SIZE 128
+
+#define LONG_MESSAGE_SIZE 32000
+
+#define SHORT_BURST_SECONDS 2
+
+#define LONG_BURST_SECONDS 2
+
+#define SHORT_BURST_WINDOW \
+  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,SHORT_BURST_SECONDS)
+
+#define LONG_BURST_WINDOW \
+  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,SHORT_BURST_SECONDS)
+
+#define BURST_SHORT 0
+
+#define BURST_LONG 1
+
+#define SIZE_CHECK 2
+
+static char short_payload[SHORT_MESSAGE_SIZE];
+
+static char long_payload[LONG_MESSAGE_SIZE];
+
+static uint32_t ack = 0;
+
+static int phase;
+
+static size_t long_received = 0;
+
+static size_t short_received = 0;
 
 static void
 communicator_available_cb (void *cls,
@@ -130,6 +159,73 @@ queue_create_reply_cb (void *cls,
 }
 
 
+static void
+size_test (void *cls)
+{
+  char payload[ack];
+
+  memset (payload, 0, ack);
+  if (ack < UINT16_MAX)
+  {
+    GNUNET_TRANSPORT_TESTING_transport_communicator_send (my_tc,
+                                                          &payload,
+                                                          sizeof(payload));
+    return;
+  }
+    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+              "LONG Goodput (bytes/s): %lu\n",
+              (LONG_MESSAGE_SIZE * long_received) / LONG_BURST_SECONDS);
+  ret = 0;
+  GNUNET_SCHEDULER_shutdown ();
+  // Finished!
+}
+
+
+static void
+long_test (void *cls)
+{
+  struct GNUNET_TIME_Relative duration = GNUNET_TIME_absolute_get_duration (
+    start_long);
+  if (LONG_BURST_WINDOW.rel_value_us > duration.rel_value_us)
+  {
+    GNUNET_TRANSPORT_TESTING_transport_communicator_send (my_tc,
+                                                          &long_payload,
+                                                          sizeof(long_payload));
+    GNUNET_SCHEDULER_add_now (&long_test, NULL);
+    return;
+  }
+  phase = SIZE_CHECK;
+  ack = 5;
+  GNUNET_SCHEDULER_add_now (&size_test, NULL);
+}
+
+
+static void
+short_test (void *cls)
+{
+  struct GNUNET_TIME_Relative duration = GNUNET_TIME_absolute_get_duration (
+    start_short);
+  if (SHORT_BURST_WINDOW.rel_value_us > duration.rel_value_us)
+  {
+    GNUNET_TRANSPORT_TESTING_transport_communicator_send (my_tc,
+                                                          &short_payload,
+                                                          sizeof(short_payload));
+
+    GNUNET_SCHEDULER_add_now (&short_test, NULL);
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Short test done!\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+              "SHORT Goodput (bytes/s): %lu - received packets: %lu\n",
+              (SHORT_MESSAGE_SIZE * short_received) / SHORT_BURST_SECONDS,
+              short_received);
+  start_long = GNUNET_TIME_absolute_get ();
+  phase = BURST_LONG;
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &long_test, NULL);
+}
+
+
 /**
  * @brief Handle opening of queue
  *
@@ -147,11 +243,14 @@ add_queue_cb (void *cls,
               struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *
               tc_queue)
 {
+  if (0 != strcmp ((char*) cls, cfg_peers_name[0]))
+    return; // TODO?
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Got Queue!\n");
-  GNUNET_TRANSPORT_TESTING_transport_communicator_send (tc_queue,
-                                                        &payload,
-                                                        sizeof(payload));
+       "Queue established, starting test...\n");
+  start_short = GNUNET_TIME_absolute_get ();
+  my_tc = tc_queue;
+  phase = BURST_SHORT;
+  GNUNET_SCHEDULER_add_now (&short_test, tc_queue);
 }
 
 
@@ -168,20 +267,40 @@ void
 incoming_message_cb (void *cls,
                      struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle
                      *tc_h,
-                     const struct GNUNET_TRANSPORT_IncomingMessage *msg)
+                     const char*payload,
+                     size_t payload_len)
 {
-  char *payload_ptr;
+  //GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+  //            "Receiving payload with size %lu...\n", payload_len);
   if (0 != strcmp ((char*) cls, cfg_peers_name[NUM_PEERS - 1]))
     return; // TODO?
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%s received data (%lu bytes payload)\n",
-              (char*) cls,
-              ntohs (msg->header.size) - sizeof (struct GNUNET_TRANSPORT_IncomingMessage));
-  payload_ptr = (char*)&msg[1] + sizeof (struct GNUNET_MessageHeader);
-  ret = memcmp (payload_ptr, &payload, sizeof (payload));
-  GNUNET_SCHEDULER_shutdown ();
+  if (phase == BURST_SHORT)
+  {
+    GNUNET_assert (SHORT_MESSAGE_SIZE == payload_len);
+    short_received++;
+  }
+  else if (phase == BURST_LONG)
+  {
+    if (LONG_MESSAGE_SIZE != payload_len)
+      return; //Ignore
+    long_received++;
+  }
+  else         // if (phase == SIZE_CHECK) {
+  {
+    if (ack != payload_len)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Error receiving message, corrupted.\n");
+      ret = 1;
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
+    ack += 5; // Next expected message size
+    GNUNET_SCHEDULER_add_now (&size_test, NULL);
+  }
 }
 
+
 /**
  * @brief Main function called by the scheduler
  *
@@ -190,6 +309,8 @@ incoming_message_cb (void *cls,
 static void
 run (void *cls)
 {
+  memset (long_payload, 0, LONG_MESSAGE_SIZE);
+  memset (short_payload, 0, SHORT_MESSAGE_SIZE);
   for (int i = 0; i < NUM_PEERS; i++)
   {
     tc_hs[i] = GNUNET_TRANSPORT_TESTING_transport_communicator_service_start (

diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c
index b354f7c2ac8269c0498c7d05853f4966a2d8f0a4..230c35b4f8125a5d906f0ccad5011bcd3b684e58 100644 (file)
--- a/src/transport/transport-testing2.c
+++ b/src/transport/transport-testing2.c
@@ -358,21 +358,39 @@ check_incoming_msg (void *cls,
  */
 static void
 handle_incoming_msg (void *cls,
-                     const struct GNUNET_TRANSPORT_IncomingMessage *msg)
+                     const struct GNUNET_TRANSPORT_IncomingMessage *inc_msg)
 {
   struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h = cls;
+  struct GNUNET_MessageHeader *msg;
+  msg = (struct GNUNET_MessageHeader *)&inc_msg[1];
+  size_t payload_len = ntohs (msg->size) - sizeof (struct
+                                                          GNUNET_MessageHeader);
 
   if (NULL != tc_h->incoming_msg_cb)
   {
     tc_h->incoming_msg_cb (tc_h->cb_cls,
                            tc_h,
-                           msg);
+                           (char*) &msg[1],
+                           payload_len);
   }
   else
   {
     LOG (GNUNET_ERROR_TYPE_WARNING,
          "Incoming message from communicator but no handler!\n");
   }
+  if (0 != ntohl (inc_msg->fc_on))
+  {
+    /* send ACK when done to communicator for flow control! */
+    struct GNUNET_MQ_Envelope *env;
+    struct GNUNET_TRANSPORT_IncomingMessageAck *ack;
+
+    env = GNUNET_MQ_msg (ack, GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG_ACK);
+    ack->reserved = htonl (0);
+    ack->fc_id = inc_msg->fc_id;
+    ack->sender = inc_msg->sender;
+    GNUNET_MQ_send (tc_h->c_mq, env);
+  }
+
   GNUNET_SERVICE_client_continue (tc_h->client);
 }
 
@@ -458,7 +476,9 @@ handle_add_queue_message (void *cls,
     {
       tc_queue = tc_queue->next;
     }
-  } else {
+  }
+  else
+  {
     tc_queue =
       GNUNET_new (struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue);
     tc_queue->tc_h = tc_h;
@@ -802,9 +822,7 @@ struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorTransmission *
 GNUNET_TRANSPORT_TESTING_transport_communicator_send
   (struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *tc_queue,
   const void *payload,
-  size_t payload_size /*,
-                         GNUNET_TRANSPORT_TESTING_SuccessStatus cb,
-                         void *cb_cls*/)
+  size_t payload_size)
 {
   struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorTransmission *tc_t;
   struct GNUNET_MessageHeader *mh;

diff --git a/src/transport/transport-testing2.h b/src/transport/transport-testing2.h
index 49e4791aad6c3a897e1757f9b73063e131ec55eb..4e047828e417343f416295025a04de224d5eb874 100644 (file)
--- a/src/transport/transport-testing2.h
+++ b/src/transport/transport-testing2.h
@@ -134,8 +134,8 @@ typedef void
                                                     struct
                                                     GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle
                                                     *tc_h,
-                                                    const struct
-                                                    GNUNET_TRANSPORT_IncomingMessage *msg);
+                                                    const char* payload,
+                                                    size_t payload_len);
 
 
 /**
@@ -198,6 +198,4 @@ GNUNET_TRANSPORT_TESTING_transport_communicator_send (struct
                                                       GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue
                                                       *tc_queue,
                                                       const void *payload,
-                                                      size_t payload_size /*,
-                         GNUNET_TRANSPORT_TESTING_SuccessStatus cb,
-                         void *cb_cls*/               );
+                                                      size_t payload_size);