diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-03-20 12:45:45 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-03-20 12:45:45 +0000 |
commit | 89c02fe1fe06c6bd11c5988a7420e7fca50f8ed0 (patch) | |
tree | 0671b70cd2705a9a3dccb71b7cdd23e4666f83d3 /src/regex | |
parent | a73cfc7583145f6733b196763f9bfe8a24985185 (diff) | |
download | gnunet-89c02fe1fe06c6bd11c5988a7420e7fca50f8ed0.tar.gz gnunet-89c02fe1fe06c6bd11c5988a7420e7fca50f8ed0.zip |
- fix index
Diffstat (limited to 'src/regex')
-rw-r--r-- | src/regex/gnunet-regex-profiler.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c index ea6fd6fdc..a3b970887 100644 --- a/src/regex/gnunet-regex-profiler.c +++ b/src/regex/gnunet-regex-profiler.c | |||
@@ -351,7 +351,7 @@ static unsigned int peers_found; | |||
351 | /** | 351 | /** |
352 | * Index of peer to start next announce/search.. | 352 | * Index of peer to start next announce/search.. |
353 | */ | 353 | */ |
354 | static unsigned int search_index; | 354 | static unsigned int next_search; |
355 | 355 | ||
356 | /** | 356 | /** |
357 | * Search task identifier | 357 | * Search task identifier |
@@ -1089,7 +1089,10 @@ arm_start_cb (void *cls, struct GNUNET_ARM_Handle *arm, | |||
1089 | 1089 | ||
1090 | { | 1090 | { |
1091 | long search_peer; | 1091 | long search_peer; |
1092 | unsigned int i = 0; | 1092 | unsigned int i; |
1093 | unsigned int me; | ||
1094 | |||
1095 | me = peer - peers; | ||
1093 | 1096 | ||
1094 | /* Find a peer to look for a string matching the regex announced */ | 1097 | /* Find a peer to look for a string matching the regex announced */ |
1095 | search_peer = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, | 1098 | search_peer = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, |
@@ -1098,14 +1101,14 @@ arm_start_cb (void *cls, struct GNUNET_ARM_Handle *arm, | |||
1098 | { | 1101 | { |
1099 | search_peer = (search_peer + 1) % num_peers; | 1102 | search_peer = (search_peer + 1) % num_peers; |
1100 | if (i > num_peers) | 1103 | if (i > num_peers) |
1101 | GNUNET_abort (); /* we run out of peers, must be a bug */ | 1104 | GNUNET_abort (); /* we ran out of peers, must be a bug */ |
1102 | } | 1105 | } |
1103 | peers[search_peer].search_str = search_strings[search_index]; | 1106 | peers[search_peer].search_str = search_strings[me]; |
1104 | GNUNET_SCHEDULER_add_delayed (ANNOUNCE_TIME, | 1107 | GNUNET_SCHEDULER_add_delayed (ANNOUNCE_TIME, |
1105 | &find_string, | 1108 | &find_string, |
1106 | (void *) search_peer); | 1109 | (void *) search_peer); |
1107 | } | 1110 | } |
1108 | if (search_index == (num_peers - 1) && | 1111 | if (next_search >= num_peers && |
1109 | GNUNET_SCHEDULER_NO_TASK == search_timeout_task) | 1112 | GNUNET_SCHEDULER_NO_TASK == search_timeout_task) |
1110 | { | 1113 | { |
1111 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "All daemons started.\n"); | 1114 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "All daemons started.\n"); |
@@ -1145,6 +1148,7 @@ arm_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op, | |||
1145 | } | 1148 | } |
1146 | 1149 | ||
1147 | GNUNET_assert (NULL != peer->arm_handle); | 1150 | GNUNET_assert (NULL != peer->arm_handle); |
1151 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[]%p - ()%p\n", peer->op_handle, op); | ||
1148 | GNUNET_assert (peer->op_handle == op); | 1152 | GNUNET_assert (peer->op_handle == op); |
1149 | GNUNET_assert (peer->arm_handle == ca_result); | 1153 | GNUNET_assert (peer->arm_handle == ca_result); |
1150 | 1154 | ||
@@ -1189,22 +1193,22 @@ static void | |||
1189 | announce_next_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 1193 | announce_next_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
1190 | { | 1194 | { |
1191 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) || | 1195 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) || |
1192 | search_index >= num_peers) | 1196 | next_search >= num_peers) |
1193 | return; | 1197 | return; |
1194 | 1198 | ||
1195 | /* First connect to arm service, then announce. Next | 1199 | /* First connect to arm service, then announce. Next |
1196 | * a nnounce will be in arm_connect_cb */ | 1200 | * a nnounce will be in arm_connect_cb */ |
1197 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Starting daemon %u\n", search_index); | 1201 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Starting daemon %u\n", next_search); |
1198 | peers[search_index].op_handle = | 1202 | peers[next_search].op_handle = |
1199 | GNUNET_TESTBED_service_connect (NULL, | 1203 | GNUNET_TESTBED_service_connect (NULL, |
1200 | peers[search_index].peer_handle, | 1204 | peers[next_search].peer_handle, |
1201 | "arm", | 1205 | "arm", |
1202 | &arm_connect_cb, | 1206 | &arm_connect_cb, |
1203 | &peers[search_index], | 1207 | &peers[next_search], |
1204 | &arm_ca, | 1208 | &arm_ca, |
1205 | &arm_da, | 1209 | &arm_da, |
1206 | &peers[search_index]); | 1210 | &peers[next_search]); |
1207 | search_index++; | 1211 | next_search++; |
1208 | parallel_searches++; | 1212 | parallel_searches++; |
1209 | } | 1213 | } |
1210 | 1214 | ||