diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-04-11 13:40:36 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-04-11 13:40:36 +0000 |
commit | 05126a4092d93b60bb0d941519f1ec5794bc8a69 (patch) | |
tree | c7705bc822c5ea779ac0d9050f0092cc8ec1ff4e /src/testbed | |
parent | e184218ed36a865394112cb8afb6518cf5925624 (diff) | |
download | gnunet-05126a4092d93b60bb0d941519f1ec5794bc8a69.tar.gz gnunet-05126a4092d93b60bb0d941519f1ec5794bc8a69.zip |
- fix #2862
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/testbed_api_operations.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index a96549810..ed8461606 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c | |||
@@ -463,12 +463,17 @@ decide_capacity (struct OperationQueue *opq, | |||
463 | 463 | ||
464 | GNUNET_assert (NULL != (op = entry->op)); | 464 | GNUNET_assert (NULL != (op = entry->op)); |
465 | GNUNET_assert (0 < (need = entry->nres)); | 465 | GNUNET_assert (0 < (need = entry->nres)); |
466 | GNUNET_assert (opq->active <= opq->max_active); | ||
467 | ops = NULL; | 466 | ops = NULL; |
468 | n_ops = 0; | 467 | n_ops = 0; |
469 | evict_entries = NULL; | 468 | evict_entries = NULL; |
470 | n_evict_entries = 0; | 469 | n_evict_entries = 0; |
471 | rval = GNUNET_OK; | 470 | rval = GNUNET_YES; |
471 | if (opq->active > opq->max_active) | ||
472 | { | ||
473 | need += opq->active - opq->max_active; | ||
474 | rval = GNUNET_NO; | ||
475 | goto ret; | ||
476 | } | ||
472 | if ((opq->active + need) <= opq->max_active) | 477 | if ((opq->active + need) <= opq->max_active) |
473 | goto ret; | 478 | goto ret; |
474 | deficit = need - (opq->max_active - opq->active); | 479 | deficit = need - (opq->max_active - opq->active); |