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

[gnunet]

Author: bartpolot
Date: 2013-03-21 18:03:30 +0100 (Thu, 21 Mar 2013)
New Revision: 26560

Modified:
   gnunet/src/regex/gnunet-regex-profiler.c
Log:
- sync wait period with deamon

Modified: gnunet/src/regex/gnunet-regex-profiler.c
===================================================================
--- gnunet/src/regex/gnunet-regex-profiler.c    2013-03-21 16:44:05 UTC (rev 
26559)
+++ gnunet/src/regex/gnunet-regex-profiler.c    2013-03-21 17:03:30 UTC (rev 
26560)
@@ -38,8 +38,6 @@
 
 #define FIND_TIMEOUT \
         GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 90)
-#define ANNOUNCE_TIME \
-        GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 200)
 #define SEARCHES_IN_PARALLEL 100
 
 /**
@@ -143,7 +141,7 @@
   char *policy_file;
 
   /**
-   * Peers search string.
+   * Peer's search string.
    */
   const char *search_str;
 
@@ -395,7 +393,12 @@
  */
 static char * regex_prefix;
 
+/**
+ * What's the maximum regex reannounce period.
+ */
+static struct GNUNET_TIME_Relative reannounce_period_max;
 
+
 
/******************************************************************************/
 /******************************  DECLARATIONS  
********************************/
 
/******************************************************************************/
@@ -1103,7 +1106,9 @@
             GNUNET_abort (); /* we ran out of peers, must be a bug */
         }
         peers[search_peer].search_str = search_strings[me];
-        GNUNET_SCHEDULER_add_delayed (ANNOUNCE_TIME,
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
+                                        reannounce_period_max,
+                                        2),
                                       &find_string,
                                       (void *) search_peer);
       }
@@ -2058,10 +2063,20 @@
     shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
     return;
   }
+  cfg = GNUNET_CONFIGURATION_dup (config);
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (cfg, "REGEXPROFILER",
+                                           "REANNOUNCE_PERIOD_MAX",
+                                           &reannounce_period_max))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                "reannounce_period_max not given. Using 10 minutes.\n");
+    reannounce_period_max =
+      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 10);
+  }
   unsigned int i;
   for (i = 0; i < num_search_strings; i++)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "search string: %s\n", 
search_strings[i]);
-  cfg = GNUNET_CONFIGURATION_dup (config);
   abort_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                     (GNUNET_TIME_UNIT_SECONDS, 5), &do_abort,