[GNUnet-SVN] r27344 - gnunet/src/regex

[gnunet]

Author: bartpolot
Date: 2013-05-31 14:46:17 +0200 (Fri, 31 May 2013)
New Revision: 27344

Modified:
   gnunet/src/regex/gnunet-regex-profiler.c
Log:
- fix timeout handling

Modified: gnunet/src/regex/gnunet-regex-profiler.c
===================================================================
--- gnunet/src/regex/gnunet-regex-profiler.c    2013-05-30 19:15:10 UTC (rev 
27343)
+++ gnunet/src/regex/gnunet-regex-profiler.c    2013-05-31 12:46:17 UTC (rev 
27344)
@@ -789,7 +789,10 @@
                 GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO));
 
     if (GNUNET_SCHEDULER_NO_TASK != search_timeout_task)
+    {
       GNUNET_SCHEDULER_cancel (search_timeout_task);
+      search_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+    }
 
     GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Collecting stats and shutting 
down.\n");
     GNUNET_SCHEDULER_add_now (&do_collect_stats, NULL);
@@ -982,11 +985,14 @@
     return;
   if (next_search >= num_peers)
   {
-    if (GNUNET_SCHEDULER_NO_TASK != search_timeout_task)
-      GNUNET_SCHEDULER_cancel (search_timeout_task);
-    search_timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_HOURS,
-                                                        &search_timed_out,
-                                                        NULL);
+    if (strings_found != num_peers)
+    {
+      if (GNUNET_SCHEDULER_NO_TASK != search_timeout_task)
+        GNUNET_SCHEDULER_cancel (search_timeout_task);
+      search_timeout_task = GNUNET_SCHEDULER_add_delayed 
(GNUNET_TIME_UNIT_HOURS,
+                                                          &search_timed_out,
+                                                          NULL);
+    }
     return;
   }