[GNUnet-SVN] r24858 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2012-11-09 12:53:46 +0100 (Fri, 09 Nov 2012)
New Revision: 24858

Modified:
   gnunet/src/mesh/test_mesh_small.c
Log:
- add cause (line) of termination call

Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c   2012-11-09 11:49:10 UTC (rev 24857)
+++ gnunet/src/mesh/test_mesh_small.c   2012-11-09 11:53:46 UTC (rev 24858)
@@ -349,8 +349,11 @@
 static void
 disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext 
*tc)
 {
+  int line = (int) (long ) cls;
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "disconnecting mesh service of peers\n");
+              "disconnecting mesh service of peers, called from line %d\n",
+              line);
   disconnect_task = GNUNET_SCHEDULER_NO_TASK;
   if (NULL != t)
   {
@@ -527,10 +530,10 @@
     if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
     {
       GNUNET_SCHEDULER_cancel (disconnect_task);
-      disconnect_task =
+    }
+    disconnect_task =
               GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers,
-                                            NULL);
-    }
+                                            (void *) __LINE__);
   }
 
   switch (client)
@@ -619,10 +622,10 @@
   if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
   {
     GNUNET_SCHEDULER_cancel (disconnect_task);
-    disconnect_task =
+  }
+  disconnect_task =
         GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers,
-                                      NULL);
-  }
+                                      (void *) __LINE__);
 
   return GNUNET_OK;
 }
@@ -671,9 +674,10 @@
   if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
   {
     GNUNET_SCHEDULER_cancel (disconnect_task);
-    disconnect_task =
-        GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers, 
NULL);
   }
+  disconnect_task =
+        GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers,
+                                      (void *) __LINE__);
 
   return NULL;
 }
@@ -717,8 +721,9 @@
   if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
   {
     GNUNET_SCHEDULER_cancel (disconnect_task);
-    disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers, NULL);
   }
+  disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers,
+                                              (void *) __LINE__);
 
   return;
 }
@@ -788,7 +793,8 @@
   {
     GNUNET_SCHEDULER_cancel (disconnect_task);
     disconnect_task =
-        GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers, 
NULL);
+        GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers,
+                                      (void *) __LINE__);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Sending data initializer...\n");
     peers_responded = 0;
@@ -840,7 +846,8 @@
   {
     GNUNET_SCHEDULER_cancel (disconnect_task);
     disconnect_task =
-        GNUNET_SCHEDULER_add_delayed (TIMEOUT, &disconnect_mesh_peers, NULL);
+        GNUNET_SCHEDULER_add_delayed (TIMEOUT, &disconnect_mesh_peers,
+                                      (void *) __LINE__);
   }
 }
 
@@ -961,7 +968,8 @@
 
   GNUNET_SCHEDULER_add_now (&connect_mesh_service, NULL);
   disconnect_task =
-      GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_mesh_peers, NULL);
+      GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_mesh_peers,
+                                    (void *) __LINE__);
 
 }