diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-04-22 14:22:10 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-04-22 14:22:10 +0000 |
commit | 08fd3307bed55f72f646fd0b5aeaaf77881e3889 (patch) | |
tree | c6e6215a8a0bfc930edf6733e41d7e902cc9fb59 /src/regex | |
parent | cc51ef9bcb8d32d66c622780ccdded17df93f2c5 (diff) | |
download | gnunet-08fd3307bed55f72f646fd0b5aeaaf77881e3889.tar.gz gnunet-08fd3307bed55f72f646fd0b5aeaaf77881e3889.zip |
- remove extra debug
Diffstat (limited to 'src/regex')
-rw-r--r-- | src/regex/gnunet-regex-profiler.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c index 47dd686f0..ae9afa9c4 100644 --- a/src/regex/gnunet-regex-profiler.c +++ b/src/regex/gnunet-regex-profiler.c | |||
@@ -428,8 +428,6 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
428 | char output_buffer[512]; | 428 | char output_buffer[512]; |
429 | size_t size; | 429 | size_t size; |
430 | 430 | ||
431 | printf("%s\n", __FUNCTION__); | ||
432 | |||
433 | shutdown_task = GNUNET_SCHEDULER_NO_TASK; | 431 | shutdown_task = GNUNET_SCHEDULER_NO_TASK; |
434 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 432 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
435 | GNUNET_SCHEDULER_cancel (abort_task); | 433 | GNUNET_SCHEDULER_cancel (abort_task); |
@@ -499,7 +497,6 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
499 | { | 497 | { |
500 | unsigned long i = (unsigned long) cls; | 498 | unsigned long i = (unsigned long) cls; |
501 | 499 | ||
502 | printf("%s\n", __FUNCTION__); | ||
503 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting %lu...\n", i); | 500 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting %lu...\n", i); |
504 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 501 | abort_task = GNUNET_SCHEDULER_NO_TASK; |
505 | result = GNUNET_SYSERR; | 502 | result = GNUNET_SYSERR; |
@@ -602,7 +599,6 @@ stats_cb (void *cls, | |||
602 | static unsigned int peer_cnt; | 599 | static unsigned int peer_cnt; |
603 | struct RegexPeer *peer = cls; | 600 | struct RegexPeer *peer = cls; |
604 | 601 | ||
605 | printf("%s\n", __FUNCTION__); | ||
606 | if (GNUNET_OK != success) | 602 | if (GNUNET_OK != success) |
607 | { | 603 | { |
608 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 604 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
@@ -743,7 +739,6 @@ regex_found_handler (void *cls, | |||
743 | char output_buffer[512]; | 739 | char output_buffer[512]; |
744 | size_t size; | 740 | size_t size; |
745 | 741 | ||
746 | printf("%s\n", __FUNCTION__); | ||
747 | if (GNUNET_YES == peer->search_str_matched) | 742 | if (GNUNET_YES == peer->search_str_matched) |
748 | { | 743 | { |
749 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 744 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
@@ -830,7 +825,6 @@ regex_found_handler (void *cls, | |||
830 | static void | 825 | static void |
831 | search_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc) | 826 | search_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc) |
832 | { | 827 | { |
833 | printf("%s\n", __FUNCTION__); | ||
834 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 828 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
835 | "Finding matches to all strings did not succeed after %s.\n", | 829 | "Finding matches to all strings did not succeed after %s.\n", |
836 | GNUNET_STRINGS_relative_time_to_string (search_timeout_time, | 830 | GNUNET_STRINGS_relative_time_to_string (search_timeout_time, |
@@ -860,7 +854,6 @@ find_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
860 | { | 854 | { |
861 | struct RegexPeer *p = cls; | 855 | struct RegexPeer *p = cls; |
862 | 856 | ||
863 | printf("%s\n", __FUNCTION__); | ||
864 | p->timeout = GNUNET_SCHEDULER_NO_TASK; | 857 | p->timeout = GNUNET_SCHEDULER_NO_TASK; |
865 | 858 | ||
866 | if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) | 859 | if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) |
@@ -884,7 +877,6 @@ find_string (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
884 | { | 877 | { |
885 | unsigned int search_peer = (unsigned int) (long) cls; | 878 | unsigned int search_peer = (unsigned int) (long) cls; |
886 | 879 | ||
887 | printf("%s\n", __FUNCTION__); | ||
888 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) || | 880 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) || |
889 | search_peer >= num_search_strings) | 881 | search_peer >= num_search_strings) |
890 | return; | 882 | return; |
@@ -930,7 +922,6 @@ daemon_started (void *cls, struct GNUNET_TESTBED_Operation *op, | |||
930 | unsigned int i; | 922 | unsigned int i; |
931 | unsigned int me; | 923 | unsigned int me; |
932 | 924 | ||
933 | printf("%s\n", __FUNCTION__); | ||
934 | GNUNET_TESTBED_operation_done (peer->daemon_op); | 925 | GNUNET_TESTBED_operation_done (peer->daemon_op); |
935 | peer->daemon_op = NULL; | 926 | peer->daemon_op = NULL; |
936 | me = peer - peers; | 927 | me = peer - peers; |
@@ -972,7 +963,6 @@ do_announce (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
972 | { | 963 | { |
973 | unsigned int i; | 964 | unsigned int i; |
974 | 965 | ||
975 | printf("%s\n", __FUNCTION__); | ||
976 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Starting announce.\n"); | 966 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Starting announce.\n"); |
977 | 967 | ||
978 | for (i = 0; i < SEARCHES_IN_PARALLEL; i++) | 968 | for (i = 0; i < SEARCHES_IN_PARALLEL; i++) |
@@ -996,7 +986,6 @@ announce_next_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
996 | { | 986 | { |
997 | struct RegexPeer *peer; | 987 | struct RegexPeer *peer; |
998 | 988 | ||
999 | printf("%s\n", __FUNCTION__); | ||
1000 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) || | 989 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) || |
1001 | next_search >= num_peers) | 990 | next_search >= num_peers) |
1002 | return; | 991 | return; |
@@ -1030,7 +1019,6 @@ dht_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op, | |||
1030 | { | 1019 | { |
1031 | struct RegexPeer *peer = (struct RegexPeer *) cls; | 1020 | struct RegexPeer *peer = (struct RegexPeer *) cls; |
1032 | 1021 | ||
1033 | printf("%s\n", __FUNCTION__); | ||
1034 | if (NULL != emsg || NULL == op || NULL == ca_result) | 1022 | if (NULL != emsg || NULL == op || NULL == ca_result) |
1035 | { | 1023 | { |
1036 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "DHT connect failed: %s\n", emsg); | 1024 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "DHT connect failed: %s\n", emsg); |
@@ -1117,7 +1105,6 @@ test_master (void *cls, | |||
1117 | { | 1105 | { |
1118 | unsigned int i; | 1106 | unsigned int i; |
1119 | 1107 | ||
1120 | printf("%s\n", __FUNCTION__); | ||
1121 | GNUNET_assert (num_peers_ == num_peers); | 1108 | GNUNET_assert (num_peers_ == num_peers); |
1122 | 1109 | ||
1123 | prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time); | 1110 | prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time); |
@@ -1167,7 +1154,6 @@ load_search_strings (const char *filename, char ***strings, unsigned int limit) | |||
1167 | int str_cnt; | 1154 | int str_cnt; |
1168 | unsigned int i; | 1155 | unsigned int i; |
1169 | 1156 | ||
1170 | printf("%s\n", __FUNCTION__); | ||
1171 | if (NULL == filename) | 1157 | if (NULL == filename) |
1172 | { | 1158 | { |
1173 | return GNUNET_SYSERR; | 1159 | return GNUNET_SYSERR; |
@@ -1236,8 +1222,6 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
1236 | unsigned int nsearchstrs; | 1222 | unsigned int nsearchstrs; |
1237 | unsigned int i; | 1223 | unsigned int i; |
1238 | 1224 | ||
1239 | printf("%s\n", __FUNCTION__); | ||
1240 | |||
1241 | /* Check config */ | 1225 | /* Check config */ |
1242 | if (NULL == config) | 1226 | if (NULL == config) |
1243 | { | 1227 | { |
@@ -1357,7 +1341,6 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
1357 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); | 1341 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); |
1358 | event_mask |= (1LL << GNUNET_TESTBED_ET_DISCONNECT);*/ | 1342 | event_mask |= (1LL << GNUNET_TESTBED_ET_DISCONNECT);*/ |
1359 | prof_start_time = GNUNET_TIME_absolute_get (); | 1343 | prof_start_time = GNUNET_TIME_absolute_get (); |
1360 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "1.\n"); | ||
1361 | GNUNET_TESTBED_run (args[0], | 1344 | GNUNET_TESTBED_run (args[0], |
1362 | cfg, | 1345 | cfg, |
1363 | num_peers, | 1346 | num_peers, |
@@ -1366,13 +1349,11 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
1366 | NULL, /* master_controller_cb cls */ | 1349 | NULL, /* master_controller_cb cls */ |
1367 | &test_master, | 1350 | &test_master, |
1368 | NULL); /* test_master cls */ | 1351 | NULL); /* test_master cls */ |
1369 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "2.\n"); | ||
1370 | abort_task = | 1352 | abort_task = |
1371 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 1353 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
1372 | (GNUNET_TIME_UNIT_MINUTES, 5), | 1354 | (GNUNET_TIME_UNIT_MINUTES, 5), |
1373 | &do_abort, | 1355 | &do_abort, |
1374 | (void*) __LINE__); | 1356 | (void*) __LINE__); |
1375 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "3.\n"); | ||
1376 | } | 1357 | } |
1377 | 1358 | ||
1378 | 1359 | ||
@@ -1408,8 +1389,6 @@ main (int argc, char *const *argv) | |||
1408 | GNUNET_GETOPT_OPTION_END | 1389 | GNUNET_GETOPT_OPTION_END |
1409 | }; | 1390 | }; |
1410 | int ret; | 1391 | int ret; |
1411 | |||
1412 | printf("%s\n", __FUNCTION__); | ||
1413 | 1392 | ||
1414 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 1393 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) |
1415 | return 2; | 1394 | return 2; |