[GNUnet-SVN] r26841 - gnunet/src/regex

[gnunet]

Author: bartpolot
Date: 2013-04-10 17:25:40 +0200 (Wed, 10 Apr 2013)
New Revision: 26841

Modified:
   gnunet/src/regex/gnunet-regex-profiler.c
Log:
- fix

Modified: gnunet/src/regex/gnunet-regex-profiler.c
===================================================================
--- gnunet/src/regex/gnunet-regex-profiler.c    2013-04-10 14:41:35 UTC (rev 
26840)
+++ gnunet/src/regex/gnunet-regex-profiler.c    2013-04-10 15:25:40 UTC (rev 
26841)
@@ -38,7 +38,7 @@
 
 #define FIND_TIMEOUT \
         GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 90)
-#define SEARCHES_IN_PARALLEL 100
+#define SEARCHES_IN_PARALLEL 5
 
 /**
  * DLL of operations
@@ -337,11 +337,6 @@
 static unsigned int parallel_searches;
 
 /**
- * Index of peer/string search.
- */
-static unsigned int peer_cnt;
-
-/**
  * Number of peers found with search strings.
  */
 static unsigned int peers_found;
@@ -967,32 +962,31 @@
 static void
 find_string (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  unsigned int search_peer = (unsigned int) (long) cls;
+
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) ||
-      peer_cnt >= num_search_strings)
+      search_peer >= num_search_strings)
     return;
 
-  peers[peer_cnt].search_str = search_strings[peer_cnt];
-  peers[peer_cnt].search_str_matched = GNUNET_NO;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Searching for string \"%s\" on peer %d with file %s (%u||)\n",
-              peers[peer_cnt].search_str,
-              peer_cnt,
-              peers[peer_cnt].policy_file,
+              peers[search_peer].search_str,
+              search_peer,
+              peers[search_peer].policy_file,
               parallel_searches);
 
-  peers[peer_cnt].op_handle =
+  peers[search_peer].op_handle =
     GNUNET_TESTBED_service_connect (NULL,
-                                    peers[peer_cnt].peer_handle,
+                                    peers[search_peer].peer_handle,
                                     "dht",
                                     &dht_connect_cb,
-                                    &peers[peer_cnt],
+                                    &peers[search_peer],
                                     &dht_ca,
                                     &dht_da,
-                                    &peers[peer_cnt]);
-  peers[peer_cnt].timeout = GNUNET_SCHEDULER_add_delayed (FIND_TIMEOUT,
+                                    &peers[search_peer]);
+  peers[search_peer].timeout = GNUNET_SCHEDULER_add_delayed (FIND_TIMEOUT,
                                                           &find_timeout,
-                                                          &peers[peer_cnt]);
-  peer_cnt++;
+                                                          &peers[search_peer]);
 }
 
 
@@ -1090,7 +1084,7 @@
       GNUNET_SCHEDULER_add_now (&arm_op_done, peer);
 
       {
-        long search_peer;
+        unsigned long search_peer;
         unsigned int i;
         unsigned int me;
 
@@ -1106,6 +1100,7 @@
             GNUNET_abort (); /* we ran out of peers, must be a bug */
         }
         peers[search_peer].search_str = search_strings[me];
+        peers[search_peer].search_str_matched = GNUNET_NO;
         GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
                                         reannounce_period_max,
                                         2),