-more logging, avoid duplicate re-scheduling

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

diff --git a/src/transport/test_transport_api_monitor_peers.c b/src/transport/test_transport_api_monitor_peers.c
index fd6abe53b5e1602a9e1c48f2bf717da1530db5d5..13a7baec8466323b085efca14e107e41cadf0a26 100644 (file)
--- a/src/transport/test_transport_api_monitor_peers.c
+++ b/src/transport/test_transport_api_monitor_peers.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_monitor_peers.c
@@ -53,9 +53,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,13 +90,16 @@ end ()
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Stopping peers\n");
 
-  if (send_task != GNUNET_SCHEDULER_NO_TASK)
+  if (send_task != NULL)
+  {
     GNUNET_SCHEDULER_cancel (send_task);
+    send_task = NULL;
+  }
 
-  if (die_task != GNUNET_SCHEDULER_NO_TASK)
+  if (die_task != NULL)
   {
     GNUNET_SCHEDULER_cancel (die_task);
-    die_task = GNUNET_SCHEDULER_NO_TASK;
+    die_task = NULL;
   }
 
   if (th != NULL)
@@ -121,8 +124,6 @@ end ()
     pmc_p2 = NULL;
   }
 
-
-
   ok = 0;
 }
 
@@ -131,13 +132,14 @@ 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_INFO, "Fail! Stopping peers\n");
 
-
-  if (send_task != GNUNET_SCHEDULER_NO_TASK)
+  if (send_task != NULL)
+  {
     GNUNET_SCHEDULER_cancel (send_task);
+    send_task = NULL;
+  }
 
   if (cc != NULL)
   {
@@ -227,7 +229,7 @@ notify_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;
@@ -257,7 +259,7 @@ notify_ready (void *cls, size_t size, void *buf)
 static void
 sendtask (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;
@@ -389,15 +391,15 @@ monitor1_cb (void *cls,
              enum GNUNET_TRANSPORT_PeerState state,
              struct GNUNET_TIME_Absolute state_timeout)
 {
-  if ((NULL == peer) || (NULL == p1))
+  if ((NULL == address) || (NULL == p1))
     return;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Monitor 1: %s %s %s\n",
-              GNUNET_i2s (peer),
+              GNUNET_i2s (&address->peer),
               GNUNET_TRANSPORT_ps2s (state),
               GNUNET_STRINGS_absolute_time_to_string(state_timeout));
-  if ((0 == memcmp (peer, &p2->id, sizeof (p2->id)) &&
+  if ((0 == memcmp (&address->peer, &p2->id, sizeof (p2->id)) &&
       (GNUNET_YES == GNUNET_TRANSPORT_is_connected(state)) &&
       GNUNET_NO == p1_c) )
   {
@@ -415,15 +417,15 @@ monitor2_cb (void *cls,
              enum GNUNET_TRANSPORT_PeerState state,
              struct GNUNET_TIME_Absolute state_timeout)
 {
-  if ((NULL == peer) || (NULL == p2))
+  if ((NULL == address) || (NULL == p2))
     return;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Monitor 2: %s %s %s\n",
-              GNUNET_i2s (peer),
+              GNUNET_i2s (&address->peer),
               GNUNET_TRANSPORT_ps2s (state),
               GNUNET_STRINGS_absolute_time_to_string(state_timeout));
-  if ((0 == memcmp (peer, &p1->id, sizeof (p1->id)) &&
+  if ((0 == memcmp (&address->peer, &p1->id, sizeof (p1->id)) &&
       (GNUNET_YES == GNUNET_TRANSPORT_is_connected(state)) &&
       GNUNET_NO == p2_c) )
   {
@@ -460,7 +462,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;
@@ -480,7 +482,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,