diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-02-20 18:00:59 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-02-20 18:00:59 +0000 |
commit | dd5bdc8f33925604912901f1bde6f4f8652a9585 (patch) | |
tree | 1bd01df6ffdfd5dce270391e4cac94ada41e13a0 /src/regex | |
parent | 1a1380cf58fedd44cdecc2a29bf43f5da0bc3553 (diff) | |
download | gnunet-dd5bdc8f33925604912901f1bde6f4f8652a9585.tar.gz gnunet-dd5bdc8f33925604912901f1bde6f4f8652a9585.zip |
- keep track of the search parallelization
Diffstat (limited to 'src/regex')
-rw-r--r-- | src/regex/gnunet-regex-profiler.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c index 8d460ef74..fbf410bad 100644 --- a/src/regex/gnunet-regex-profiler.c +++ b/src/regex/gnunet-regex-profiler.c | |||
@@ -336,6 +336,11 @@ static char **search_strings; | |||
336 | static int num_search_strings; | 336 | static int num_search_strings; |
337 | 337 | ||
338 | /** | 338 | /** |
339 | * How many searches are running in parallel | ||
340 | */ | ||
341 | static unsigned int parallel_searches; | ||
342 | |||
343 | /** | ||
339 | * Index of peer/string search. | 344 | * Index of peer/string search. |
340 | */ | 345 | */ |
341 | static unsigned int peer_cnt; | 346 | static unsigned int peer_cnt; |
@@ -836,6 +841,7 @@ regex_found_handler (void *cls, | |||
836 | } | 841 | } |
837 | 842 | ||
838 | peers_found++; | 843 | peers_found++; |
844 | parallel_searches--; | ||
839 | 845 | ||
840 | if (GNUNET_SCHEDULER_NO_TASK != peer->timeout) | 846 | if (GNUNET_SCHEDULER_NO_TASK != peer->timeout) |
841 | { | 847 | { |
@@ -859,14 +865,10 @@ regex_found_handler (void *cls, | |||
859 | else | 865 | else |
860 | { | 866 | { |
861 | prof_time = GNUNET_TIME_absolute_get_duration (peer->prof_start_time); | 867 | prof_time = GNUNET_TIME_absolute_get_duration (peer->prof_start_time); |
862 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | ||
863 | "String %s successfully matched on peer %u after %s (%i/%i)\n", | ||
864 | peer->search_str, peer->id, GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO), | ||
865 | peers_found, num_search_strings); | ||
866 | 868 | ||
867 | printf ("String %s successfully matched on peer %u after %s (%i/%i)\n", | 869 | printf ("String %s successfully matched on peer %u after %s (%i/%i) (%u||)\n", |
868 | peer->search_str, peer->id, GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO), | 870 | peer->search_str, peer->id, GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO), |
869 | peers_found, num_search_strings); | 871 | peers_found, num_search_strings, parallel_searches); |
870 | fflush (stdout); | 872 | fflush (stdout); |
871 | 873 | ||
872 | peer->search_str_matched = GNUNET_YES; | 874 | peer->search_str_matched = GNUNET_YES; |
@@ -995,13 +997,15 @@ find_next_string (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
995 | peer_cnt >= (num_search_strings - 1)) | 997 | peer_cnt >= (num_search_strings - 1)) |
996 | return; | 998 | return; |
997 | 999 | ||
1000 | parallel_searches++; | ||
998 | peers[peer_cnt].search_str = search_strings[peer_cnt]; | 1001 | peers[peer_cnt].search_str = search_strings[peer_cnt]; |
999 | peers[peer_cnt].search_str_matched = GNUNET_NO; | 1002 | peers[peer_cnt].search_str_matched = GNUNET_NO; |
1000 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 1003 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1001 | "Searching for string \"%s\" on peer %d with file %s\n", | 1004 | "Searching for string \"%s\" on peer %d with file %s (%u||)\n", |
1002 | peers[peer_cnt].search_str, | 1005 | peers[peer_cnt].search_str, |
1003 | peer_cnt, | 1006 | peer_cnt, |
1004 | peers[peer_cnt].policy_file); | 1007 | peers[peer_cnt].policy_file, |
1008 | parallel_searches); | ||
1005 | 1009 | ||
1006 | peers[peer_cnt].op_handle = | 1010 | peers[peer_cnt].op_handle = |
1007 | GNUNET_TESTBED_service_connect (NULL, | 1011 | GNUNET_TESTBED_service_connect (NULL, |