projects / oweals / gnunet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
trying to fix #4003
[oweals/gnunet.git] / src / transport / test_transport_api_manipulation_cfg.c
diff --git a/src/transport/test_transport_api_manipulation_cfg.c b/src/transport/test_transport_api_manipulation_cfg.c
index 29d631d80a4153b748737a817627b7a8b6632fdb..aa1f57a2a3b0a215cf1bc3566e3ee5f6224aa6c7 100644 (file)
--- a/src/transport/test_transport_api_manipulation_cfg.c
+++ b/src/transport/test_transport_api_manipulation_cfg.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file transport/test_transport_api_manipulation_send_tcp.c
@@ -25,8 +25,8 @@
  * Peer 1 has inbound and outbound delay of 100ms
  * Peer 2 has no inbound and outbound delay
  *
- * We send a request from P1 to P2 and expect delay of >= TEST_DELAY ms
- * Then we send response from P2 to P1 and expect delay of >= TEST_DELAY ms
+ * We send a request from P1 to P2 and expect delay of >= TEST_DELAY us
+ * Then we send response from P2 to P1 and expect delay of >= TEST_DELAY us
  */
 #include "platform.h"
 #include "gnunet_transport_service.h"
@@ -48,7 +48,10 @@
 
 #define TEST_RESPONSE_MESSAGE_TYPE 12346
 
-#define TEST_DELAY 100
+/**
+ * Test delay, in microseconds.
+ */
+#define TEST_DELAY 100 * 1000LL
 
 static char *test_source;
 
@@ -64,9 +67,9 @@ static int s_connected;
 
 static int s_sending;
 
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static struct GNUNET_SCHEDULER_Task * die_task;
 
-static GNUNET_SCHEDULER_TaskIdentifier send_task;
+static struct GNUNET_SCHEDULER_Task * send_task;
 
 static struct PeerContext *p1;
 
@@ -90,10 +93,10 @@ end ()
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
 
-  if (send_task != GNUNET_SCHEDULER_NO_TASK)
+  if (send_task != NULL)
     GNUNET_SCHEDULER_cancel (send_task);
 
-  if (die_task != GNUNET_SCHEDULER_NO_TASK)
+  if (die_task != NULL)
     GNUNET_SCHEDULER_cancel (die_task);
 
   if (th != NULL)
@@ -107,12 +110,12 @@ end ()
 static void
 end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  die_task = GNUNET_SCHEDULER_NO_TASK;
+  die_task = NULL;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
 
 
-  if (send_task != GNUNET_SCHEDULER_NO_TASK)
+  if (send_task != NULL)
     GNUNET_SCHEDULER_cancel (send_task);
 
   if (cc != NULL)
@@ -169,7 +172,7 @@ notify_request_ready (void *cls, size_t size, void *buf)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Timeout occurred while waiting for transmit_ready\n");
-    if (GNUNET_SCHEDULER_NO_TASK != die_task)
+    if (NULL != die_task)
       GNUNET_SCHEDULER_cancel (die_task);
     die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
     ok = 42;
@@ -198,7 +201,7 @@ notify_request_ready (void *cls, size_t size, void *buf)
 static void
 sendtask_request_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  send_task = GNUNET_SCHEDULER_NO_TASK;
+  send_task = NULL;
 
   if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
@@ -211,7 +214,7 @@ sendtask_request_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   s_sending = GNUNET_YES;
        start_request = GNUNET_TIME_absolute_get();
-  th = GNUNET_TRANSPORT_notify_transmit_ready (p1->th, &p2->id, TEST_MESSAGE_SIZE, 0,
+  th = GNUNET_TRANSPORT_notify_transmit_ready (p1->th, &p2->id, TEST_MESSAGE_SIZE,
                                                TIMEOUT_TRANSMIT, &notify_request_ready,
                                                p2);
 }
@@ -229,7 +232,7 @@ notify_response_ready (void *cls, size_t size, void *buf)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Timeout occurred while waiting for transmit_ready\n");
-    if (GNUNET_SCHEDULER_NO_TASK != die_task)
+    if (NULL != die_task)
       GNUNET_SCHEDULER_cancel (die_task);
     die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
     ok = 42;
@@ -258,7 +261,7 @@ notify_response_ready (void *cls, size_t size, void *buf)
 static void
 sendtask_response_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  send_task = GNUNET_SCHEDULER_NO_TASK;
+  send_task = NULL;
 
   if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
@@ -271,7 +274,7 @@ sendtask_response_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc
 
   s_sending = GNUNET_YES;
        start_response = GNUNET_TIME_absolute_get();
-  th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, TEST_MESSAGE_SIZE, 0,
+  th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, TEST_MESSAGE_SIZE,
                                                TIMEOUT_TRANSMIT, &notify_response_ready,
                                                p1);
 }
@@ -304,16 +307,18 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
                case TEST_REQUEST_MESSAGE_TYPE:
                        duration = GNUNET_TIME_absolute_get_difference(start_request,
                                        GNUNET_TIME_absolute_get());
-                       if (duration.rel_value >= TEST_DELAY)
+                       if (duration.rel_value_us >= TEST_DELAY)
                                GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                             "Request message was delayed for %llu ms\n",
-                                                               duration.rel_value);
+                                           "Request message was delayed for %s\n",
+                                           GNUNET_STRINGS_relative_time_to_string (duration,
+                                                                                   GNUNET_YES));
                        else
-                       {
-                               GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                             "Request message was delayed for %llu ms, should be %u ms\n",
-                                                               duration.rel_value, TEST_DELAY);
-                               ok = 1;
+                         {
+                           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                                       "Request message was delayed for unexpected duration %s\n",
+                                       GNUNET_STRINGS_relative_time_to_string (duration,
+                                                                               GNUNET_YES));
+                           ok = 1;
                        }
 
                  /* Send response */
@@ -323,18 +328,21 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
                case TEST_RESPONSE_MESSAGE_TYPE:
                        duration = GNUNET_TIME_absolute_get_difference(start_response,
                                        GNUNET_TIME_absolute_get());
-                       if (duration.rel_value >= TEST_DELAY)
-                               GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                             "Response message was delayed for %llu ms\n", duration);
+                       if (duration.rel_value_us >= TEST_DELAY)
+                         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                                     "Response message was delayed for %s\n",
+                                     GNUNET_STRINGS_relative_time_to_string (duration,
+                                                                             GNUNET_YES));
                        else
-                       {
-                               GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                             "Response message was delayed for %llu ms, should be %u ms\n",
-                                                               duration.rel_value, TEST_DELAY);
-                               ok = 1;
+                         {
+                           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                                       "Response message was delayed for unexpected duration %s\n",
+                                       GNUNET_STRINGS_relative_time_to_string (duration,
+                                                                               GNUNET_YES));
+                           ok = 1;
                        }
                  /* Done */
-                       ok = 1;
+                       ok = 0;
                  end();
                        break;
                default:
@@ -450,7 +458,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   if ((p1 == NULL) || (p2 == NULL))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
-    if (die_task != GNUNET_SCHEDULER_NO_TASK)
+    if (die_task != NULL)
       GNUNET_SCHEDULER_cancel (die_task);
     die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
     return;
@@ -470,7 +478,7 @@ check ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  send_task = GNUNET_SCHEDULER_NO_TASK;
+  send_task = NULL;
 
   ok = 1;
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,
Unnamed repository; edit this file 'description' to name the repository.