-do not leave PPT timeout tasks behind

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

diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index d73b9584ca41ac41a8100e3fbaedab25665d1a7d..7af8e139ed7e3b1654d0258e8dc4105cd127fd28 100644 (file)
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010, 2011 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_quota_compliance.c
@@ -47,9 +47,9 @@ static char *test_plugin;
 
 static char *test_name;
 
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static struct GNUNET_SCHEDULER_Task * die_task;
 
-static GNUNET_SCHEDULER_TaskIdentifier measure_task;
+static struct GNUNET_SCHEDULER_Task * measure_task;
 
 struct PeerContext *p1;
 
@@ -90,7 +90,6 @@ static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
 #define MTYPE 12345
 
 GNUNET_NETWORK_STRUCT_BEGIN
-
 struct TestMessage
 {
   struct GNUNET_MessageHeader header;
@@ -154,7 +153,7 @@ end ()
                 datarate, quota_out_p1, quota_in_p2);
   }
 
-  if (die_task != GNUNET_SCHEDULER_NO_TASK)
+  if (die_task != NULL)
     GNUNET_SCHEDULER_cancel (die_task);
 
   if (th != NULL)
@@ -172,10 +171,10 @@ end ()
 static void
 end_badly ()
 {
-  die_task = GNUNET_SCHEDULER_NO_TASK;
+  die_task = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
 
-  if (measure_task != GNUNET_SCHEDULER_NO_TASK)
+  if (measure_task != NULL)
     GNUNET_SCHEDULER_cancel (measure_task);
 
   if (test_connected == GNUNET_YES)
@@ -245,7 +244,7 @@ notify_ready (void *cls, size_t size, void *buf)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Timeout occurred while waiting for transmit_ready for message %u of %u\n",
                 msg_scheduled, TOTAL_MSGS);
-    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);
     test_failed = 1;
@@ -349,7 +348,7 @@ measure (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   static int counter;
 
-  measure_task = GNUNET_SCHEDULER_NO_TASK;
+  measure_task = NULL;
 
   counter++;
   if ((DURATION.rel_value_us / 1000 / 1000LL) < counter)
@@ -416,7 +415,6 @@ static char *
 generate_config (char *cfg_file, unsigned long long quota_in,
                  unsigned long long quota_out)
 {
-  char *networks[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString;
   char *in_name;
   char *out_name;
   char *fname = NULL;
@@ -431,12 +429,16 @@ generate_config (char *cfg_file, unsigned long long quota_in,
 
   for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
   {
-      GNUNET_asprintf (&in_name, "%s_QUOTA_IN", networks[c]);
-      GNUNET_asprintf (&out_name, "%s_QUOTA_OUT", networks[c]);
-      GNUNET_CONFIGURATION_set_value_number (cfg, "ats", in_name, quota_in);
-      GNUNET_CONFIGURATION_set_value_number (cfg, "ats", out_name, quota_out);
-      GNUNET_free (in_name);
-      GNUNET_free (out_name);
+    GNUNET_asprintf (&in_name,
+                     "%s_QUOTA_IN",
+                     GNUNET_ATS_print_network_type (c));
+    GNUNET_asprintf (&out_name,
+                     "%s_QUOTA_OUT",
+                     GNUNET_ATS_print_network_type (c));
+    GNUNET_CONFIGURATION_set_value_number (cfg, "ats", in_name, quota_in);
+    GNUNET_CONFIGURATION_set_value_number (cfg, "ats", out_name, quota_out);
+    GNUNET_free (in_name);
+    GNUNET_free (out_name);
   }
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write (cfg, fname));
   GNUNET_CONFIGURATION_destroy (cfg);
@@ -473,7 +475,7 @@ run_measurement (unsigned long long p1_quota_in,
   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;