-indentation

[oweals/gnunet.git] / src / testbed / testbed_api_operations.c

diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index f9f36df7598ddee57d332795bf83ef957872e01e..e1dc33f49da8191606bb36e9056d6894cbacacb7 100644 (file)
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -33,7 +33,7 @@
  * The number of readings containing past operation's timing information that we
  * keep track of for adaptive queues
  */
-#define ADAPTIVE_QUEUE_DEFAULT_HISTORY 10
+#define ADAPTIVE_QUEUE_DEFAULT_HISTORY 40
 
 /**
  * The number of parallel opeartions we start with by default for adaptive
@@ -850,7 +850,6 @@ adaptive_queue_set_max_active (struct OperationQueue *queue, unsigned int n)
   n = GNUNET_MIN (n ,fctx->max_active_bound);
   fctx->tslots_freeptr = GNUNET_malloc (n * sizeof (struct TimeSlot));
   fctx->nfailed = 0;
-  FPRINTF (stderr, "Parallelism: %u\n", n);
   for (cnt = 0; cnt < n; cnt++)
   {
     tslot = &fctx->tslots_freeptr[cnt];
@@ -908,6 +907,7 @@ adapt_parallelism (struct OperationQueue *queue)
     adaptive_queue_set_max_active (queue, queue->max_active); /* no change */
     return;
   }
+
   parallelism = 0;
   if (-1 == sd)
     parallelism = queue->max_active + 1;
@@ -920,11 +920,12 @@ adapt_parallelism (struct OperationQueue *queue)
   parallelism = GNUNET_MAX (parallelism, ADAPTIVE_QUEUE_DEFAULT_MAX_ACTIVE);
   adaptive_queue_set_max_active (queue, parallelism);
 
-#if 0                           /* old algorithm */
+#if 0
+  /* old algorithm */
   if (sd < 0)
     sd = 0;
   GNUNET_assert (0 <= sd);
-  GNUNET_TESTBED_SD_add_data_ (fctx->sd, (unsigned int) avg.rel_value_us);
+  //GNUNET_TESTBED_SD_add_data_ (fctx->sd, (unsigned int) avg.rel_value_us);
   if (0 == sd)
   {
     adaptive_queue_set_max_active (queue, queue->max_active * 2);