diff options
author | Bart Polot <bart@net.in.tum.de> | 2014-05-07 12:06:50 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2014-05-07 12:06:50 +0000 |
commit | be4c79e4cd4a8f118c5577874f0c95e253359595 (patch) | |
tree | 7fd74fb0cf6921c4e35a43f2593396bb4805f154 /src/regex | |
parent | 15ccd7a167bcce0dde4331092975a6401393610f (diff) | |
download | gnunet-be4c79e4cd4a8f118c5577874f0c95e253359595.tar.gz gnunet-be4c79e4cd4a8f118c5577874f0c95e253359595.zip |
Rename mesh->cadet
Diffstat (limited to 'src/regex')
-rw-r--r-- | src/regex/gnunet-daemon-regexprofiler.c | 8 | ||||
-rw-r--r-- | src/regex/gnunet-regex-simulation-profiler.c | 2 | ||||
-rw-r--r-- | src/regex/regex_internal_dht.c | 8 | ||||
-rw-r--r-- | src/regex/regex_test_lib.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/regex/gnunet-daemon-regexprofiler.c b/src/regex/gnunet-daemon-regexprofiler.c index 3efd769f1..3d6624cb8 100644 --- a/src/regex/gnunet-daemon-regexprofiler.c +++ b/src/regex/gnunet-daemon-regexprofiler.c | |||
@@ -20,9 +20,9 @@ | |||
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file regex/gnunet-daemon-regexprofiler.c | 22 | * @file regex/gnunet-daemon-regexprofiler.c |
23 | * @brief daemon that uses mesh to announce a regular expression. Used in | 23 | * @brief daemon that uses cadet to announce a regular expression. Used in |
24 | * conjunction with gnunet-regex-profiler to announce regexes on serveral peers | 24 | * conjunction with gnunet-regex-profiler to announce regexes on serveral peers |
25 | * without the need to explicitly connect to the mesh service running on the | 25 | * without the need to explicitly connect to the cadet service running on the |
26 | * peer from within the profiler. | 26 | * peer from within the profiler. |
27 | * @author Maximilian Szengel | 27 | * @author Maximilian Szengel |
28 | * @author Bartlomiej Polot | 28 | * @author Bartlomiej Polot |
@@ -192,7 +192,7 @@ reannounce_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
192 | * Announce the given regular expression using regex and the path compression | 192 | * Announce the given regular expression using regex and the path compression |
193 | * length read from config. | 193 | * length read from config. |
194 | * | 194 | * |
195 | * @param regex regular expression to announce on this peer's mesh. | 195 | * @param regex regular expression to announce on this peer's cadet. |
196 | */ | 196 | */ |
197 | static void | 197 | static void |
198 | announce_regex (const char * regex) | 198 | announce_regex (const char * regex) |
@@ -377,7 +377,7 @@ main (int argc, char *const *argv) | |||
377 | return (GNUNET_OK == | 377 | return (GNUNET_OK == |
378 | GNUNET_PROGRAM_run (argc, argv, "regexprofiler", | 378 | GNUNET_PROGRAM_run (argc, argv, "regexprofiler", |
379 | gettext_noop | 379 | gettext_noop |
380 | ("Daemon to announce regular expressions for the peer using mesh."), | 380 | ("Daemon to announce regular expressions for the peer using cadet."), |
381 | options, &run, NULL)) ? global_ret : 1; | 381 | options, &run, NULL)) ? global_ret : 1; |
382 | } | 382 | } |
383 | 383 | ||
diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/regex/gnunet-regex-simulation-profiler.c index 4b3cf5bcd..f00108011 100644 --- a/src/regex/gnunet-regex-simulation-profiler.c +++ b/src/regex/gnunet-regex-simulation-profiler.c | |||
@@ -21,7 +21,7 @@ | |||
21 | /** | 21 | /** |
22 | * @file regex/gnunet-regex-simulation-profiler.c | 22 | * @file regex/gnunet-regex-simulation-profiler.c |
23 | * @brief Regex profiler that dumps all DFAs into a database instead of | 23 | * @brief Regex profiler that dumps all DFAs into a database instead of |
24 | * using the DHT (with mesh). | 24 | * using the DHT (with cadet). |
25 | * @author Maximilian Szengel | 25 | * @author Maximilian Szengel |
26 | * | 26 | * |
27 | */ | 27 | */ |
diff --git a/src/regex/regex_internal_dht.c b/src/regex/regex_internal_dht.c index f7d383406..f9d002eb0 100644 --- a/src/regex/regex_internal_dht.c +++ b/src/regex/regex_internal_dht.c | |||
@@ -487,7 +487,7 @@ dht_get_string_handler (void *cls, struct GNUNET_TIME_Absolute exp, | |||
487 | 487 | ||
488 | 488 | ||
489 | /** | 489 | /** |
490 | * Iterator over found existing mesh regex blocks that match an ongoing search. | 490 | * Iterator over found existing cadet regex blocks that match an ongoing search. |
491 | * | 491 | * |
492 | * @param cls Closure (current context)- | 492 | * @param cls Closure (current context)- |
493 | * @param key Current key code (key for cached block). | 493 | * @param key Current key code (key for cached block). |
@@ -519,7 +519,7 @@ regex_result_iterator (void *cls, | |||
519 | GNUNET_BLOCK_is_accepting (block, result->size)); | 519 | GNUNET_BLOCK_is_accepting (block, result->size)); |
520 | regex_next_edge (block, result->size, ctx); | 520 | regex_next_edge (block, result->size, ctx); |
521 | 521 | ||
522 | GNUNET_STATISTICS_update (ctx->info->stats, "# regex mesh blocks iterated", | 522 | GNUNET_STATISTICS_update (ctx->info->stats, "# regex cadet blocks iterated", |
523 | 1, GNUNET_NO); | 523 | 1, GNUNET_NO); |
524 | 524 | ||
525 | return GNUNET_YES; | 525 | return GNUNET_YES; |
@@ -763,12 +763,12 @@ regex_cancel_dht_get (void *cls, | |||
763 | 763 | ||
764 | 764 | ||
765 | /** | 765 | /** |
766 | * Iterator over hash map entries to free MeshRegexBlocks stored during the | 766 | * Iterator over hash map entries to free CadetRegexBlocks stored during the |
767 | * search for connect_by_string. | 767 | * search for connect_by_string. |
768 | * | 768 | * |
769 | * @param cls Closure (unused). | 769 | * @param cls Closure (unused). |
770 | * @param key Current key code (unused). | 770 | * @param key Current key code (unused). |
771 | * @param value MeshRegexBlock in the hash map. | 771 | * @param value CadetRegexBlock in the hash map. |
772 | * @return GNUNET_YES if we should continue to iterate, | 772 | * @return GNUNET_YES if we should continue to iterate, |
773 | * GNUNET_NO if not. | 773 | * GNUNET_NO if not. |
774 | */ | 774 | */ |
diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c index 2f3abdc65..7a9c7d1b1 100644 --- a/src/regex/regex_test_lib.c +++ b/src/regex/regex_test_lib.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * @file src/regex/regex_test_lib.c | 21 | * @file src/regex/regex_test_lib.c |
22 | * @brief library to read regexes representing IP networks from a file. | 22 | * @brief library to read regexes representing IP networks from a file. |
23 | * and simplyfinying the into one big regex, in order to run | 23 | * and simplyfinying the into one big regex, in order to run |
24 | * tests (regex performance, mesh profiler). | 24 | * tests (regex performance, cadet profiler). |
25 | * @author Bartlomiej Polot | 25 | * @author Bartlomiej Polot |
26 | */ | 26 | */ |
27 | 27 | ||