[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26171 - gnunet/src/regex
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26171 - gnunet/src/regex |
Date: |
Wed, 20 Feb 2013 19:02:38 +0100 |
Author: bartpolot
Date: 2013-02-20 19:02:38 +0100 (Wed, 20 Feb 2013)
New Revision: 26171
Modified:
gnunet/src/regex/gnunet-daemon-regexprofiler.c
Log:
- start announce immediately (profiler takes care of load balance), reannounce
immediately for more avaliability
Modified: gnunet/src/regex/gnunet-daemon-regexprofiler.c
===================================================================
--- gnunet/src/regex/gnunet-daemon-regexprofiler.c 2013-02-20 18:00:59 UTC
(rev 26170)
+++ gnunet/src/regex/gnunet-daemon-regexprofiler.c 2013-02-20 18:02:38 UTC
(rev 26171)
@@ -69,11 +69,6 @@
static struct GNUNET_TIME_Relative reannounce_freq;
/**
- * Random delay to spread out load on the DHT.
- */
-static struct GNUNET_TIME_Relative announce_delay;
-
-/**
* Maximal path compression length for regex announcing.
*/
static unsigned long long max_path_compression;
@@ -132,6 +127,7 @@
reannounce_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_PeerIdentity id;
+ struct GNUNET_TIME_Relative random_delay;
char *regex = cls;
reannounce_task = GNUNET_SCHEDULER_NO_TASK;
@@ -155,27 +151,24 @@
(unsigned int)
max_path_compression,
stats_handle);
}
- else
- {
- GNUNET_assert (NULL != announce_handle);
- GNUNET_REGEX_reannounce (announce_handle);
- }
+ /* Will result in a double first announce */
+ GNUNET_assert (NULL != announce_handle);
+ GNUNET_REGEX_reannounce (announce_handle);
+ random_delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
+ GNUNET_CRYPTO_random_u32 (
+ GNUNET_CRYPTO_QUALITY_WEAK,
+ 600));
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))),
+ GNUNET_TIME_relative_add (reannounce_freq, random_delay),
&reannounce_regex,
cls);
}
/**
- * Announce the given regular expression using Mesh and the path compression
+ * Announce the given regular expression using regex and the path compression
* length read from config.
*
* @param regex regular expression to announce on this peer's mesh.
@@ -193,9 +186,7 @@
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == reannounce_task);
copy = GNUNET_strdup (regex);
- reannounce_task = GNUNET_SCHEDULER_add_delayed (announce_delay,
- reannounce_regex,
- (void *) copy);
+ reannounce_task = GNUNET_SCHEDULER_add_now (reannounce_regex, (void *) copy);
}
@@ -326,9 +317,6 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26171 - gnunet/src/regex,
gnunet <=