*/
static struct GNUNET_TIME_Relative reannounce_freq;
+/**
+ * Random delay to spread out load on the DHT.
+ */
+static struct GNUNET_TIME_Relative announce_delay;
+
/**
* Local peer's PeerID.
*/
/**
* Announce a previously announced regex re-using cached data.
*
- * @param cls Clocuse (not used).
+ * @param cls Closure (regex to announce if needed).
* @param tc TaskContext.
*/
static void
reannounce_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ char *regex = cls;
reannounce_task = GNUNET_SCHEDULER_NO_TASK;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ {
+ GNUNET_free (regex);
return;
- reannounce_task = GNUNET_SCHEDULER_add_delayed(reannounce_freq,
- &reannounce_regex,
- cls);
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Announcing regex: %s\n", regex);
+ GNUNET_STATISTICS_update (stats_handle, "# regexes announced", 1, GNUNET_NO);
+ if (NULL == announce_handle && NULL != regex)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "First time, creating regex: %s\n",
+ regex);
+ announce_handle = GNUNET_REGEX_announce (dht_handle,
+ &my_full_id,
+ regex,
+ (unsigned int) max_path_compression,
+ stats_handle);
+ }
+ else
+ {
+ GNUNET_assert (NULL != announce_handle);
+ GNUNET_REGEX_reannounce (announce_handle);
+ }
+
+ reannounce_task =
+ GNUNET_SCHEDULER_add_delayed (
+ GNUNET_TIME_relative_add (reannounce_freq,
+ GNUNET_TIME_relative_multiply (
+ GNUNET_TIME_UNIT_SECONDS,
+ GNUNET_CRYPTO_random_u32 (
+ GNUNET_CRYPTO_QUALITY_WEAK,
+ 600))),
+ &reannounce_regex,
+ cls);
}
static void
announce_regex (const char * regex)
{
+ char *copy;
+
if (NULL == regex || 0 == strlen (regex))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot announce empty regex\n");
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Announcing regex: %s\n", regex);
- GNUNET_STATISTICS_update (stats_handle, "# regexes announced", 1, GNUNET_NO);
- announce_handle = GNUNET_REGEX_announce (dht_handle,
- &my_full_id,
- regex,
- (unsigned int) max_path_compression,
- stats_handle);
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == reannounce_task);
- reannounce_task = GNUNET_SCHEDULER_add_delayed (reannounce_freq,
+ copy = GNUNET_strdup (regex);
+ reannounce_task = GNUNET_SCHEDULER_add_delayed (announce_delay,
reannounce_regex,
- NULL);
+ (void *) copy);
}
GNUNET_CONFIGURATION_get_value_time (cfg, "REGEXPROFILER",
"REANNOUNCE_FREQ", &reannounce_freq))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"reannounce_freq not given. Using 10 minutes.\n");
reannounce_freq =
- GNUNET_TIME_relative_multiply(GNUNET_TIME_relative_get_minute_(), 10);
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 10);
}
+ announce_delay =
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 600));
stats_handle = GNUNET_STATISTICS_create ("regexprofiler", cfg);
if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
return 2;
- sleep (30);
return (GNUNET_OK ==
GNUNET_PROGRAM_run (argc, argv, "regexprofiler",
gettext_noop