[GNUnet-SVN] r32388 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2014-02-18 17:04:44 +0100 (Tue, 18 Feb 2014)
New Revision: 32388

Modified:
   gnunet/src/testbed/testbed_api_operations.c
Log:
Do not let parallelism fall below the default parallelism value for adaptive 
queues.


Modified: gnunet/src/testbed/testbed_api_operations.c
===================================================================
--- gnunet/src/testbed/testbed_api_operations.c 2014-02-18 15:43:38 UTC (rev 
32387)
+++ gnunet/src/testbed/testbed_api_operations.c 2014-02-18 16:04:44 UTC (rev 
32388)
@@ -876,6 +876,7 @@
   int sd;
   unsigned int nvals;
   unsigned int cnt;
+  unsigned int parallelism;
 
   avg = GNUNET_TIME_UNIT_ZERO;
   nvals = 0;
@@ -907,19 +908,17 @@
     adaptive_queue_set_max_active (queue, queue->max_active); /* no change */
     return;
   }
+  parallelism = 0;
   if (-1 == sd)
-    adaptive_queue_set_max_active (queue, queue->max_active + 1);
+    parallelism = queue->max_active + 1;
   if (sd <= -2)
-    adaptive_queue_set_max_active (queue, queue->max_active * 2);
-  if (1 == queue->max_active)
-  {
-    adaptive_queue_set_max_active (queue, 1);
-    return;
-  }
+    parallelism = queue->max_active * 2;
   if (1 == sd)
-    adaptive_queue_set_max_active (queue, queue->max_active - 1);
+    parallelism = queue->max_active - 1;
   if (2 <= sd)
-    adaptive_queue_set_max_active (queue, queue->max_active / 2);
+    parallelism = queue->max_active / 2;
+  parallelism = GNUNET_MAX (parallelism, ADAPTIVE_QUEUE_DEFAULT_MAX_ACTIVE);
+  adaptive_queue_set_max_active (queue, parallelism);
 
 #if 0                           /* old algorithm */
   if (sd < 0)