diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-08-19 14:13:19 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-08-19 14:13:19 +0000 |
commit | 9dd0824b40e7afeaf948a564d544b384db12cadf (patch) | |
tree | 4d98c8d27669e8eca6259a9601e32fddfa67e39c /src/testbed/testbed_api_peers.c | |
parent | d4051630bbc5f521142f302baad60212b75f8b7f (diff) | |
download | gnunet-9dd0824b40e7afeaf948a564d544b384db12cadf.tar.gz gnunet-9dd0824b40e7afeaf948a564d544b384db12cadf.zip |
fix 2893: Move adaptive parallelisation mechanism to operation queues
Diffstat (limited to 'src/testbed/testbed_api_peers.c')
-rw-r--r-- | src/testbed/testbed_api_peers.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c index 56e28a830..fd1da85ef 100644 --- a/src/testbed/testbed_api_peers.c +++ b/src/testbed/testbed_api_peers.c | |||
@@ -410,8 +410,6 @@ opstart_overlay_connect (void *cls) | |||
410 | opc->state = OPC_STATE_STARTED; | 410 | opc->state = OPC_STATE_STARTED; |
411 | data = opc->data; | 411 | data = opc->data; |
412 | GNUNET_assert (NULL != data); | 412 | GNUNET_assert (NULL != data); |
413 | data->tslot_index = GNUNET_TESTBED_get_tslot_ (data->p1->host, data); | ||
414 | data->tstart = GNUNET_TIME_absolute_get (); | ||
415 | msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage)); | 413 | msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage)); |
416 | msg->header.size = | 414 | msg->header.size = |
417 | htons (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage)); | 415 | htons (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage)); |
@@ -434,7 +432,6 @@ static void | |||
434 | oprelease_overlay_connect (void *cls) | 432 | oprelease_overlay_connect (void *cls) |
435 | { | 433 | { |
436 | struct OperationContext *opc = cls; | 434 | struct OperationContext *opc = cls; |
437 | struct GNUNET_TIME_Relative duration; | ||
438 | struct OverlayConnectData *data; | 435 | struct OverlayConnectData *data; |
439 | 436 | ||
440 | data = opc->data; | 437 | data = opc->data; |
@@ -443,14 +440,10 @@ oprelease_overlay_connect (void *cls) | |||
443 | case OPC_STATE_INIT: | 440 | case OPC_STATE_INIT: |
444 | break; | 441 | break; |
445 | case OPC_STATE_STARTED: | 442 | case OPC_STATE_STARTED: |
446 | (void) GNUNET_TESTBED_release_time_slot_ (data->p1->host, data->tslot_index, | ||
447 | data); | ||
448 | GNUNET_TESTBED_remove_opc_ (opc->c, opc); | 443 | GNUNET_TESTBED_remove_opc_ (opc->c, opc); |
449 | break; | 444 | break; |
450 | case OPC_STATE_FINISHED: | 445 | case OPC_STATE_FINISHED: |
451 | duration = GNUNET_TIME_absolute_get_duration (data->tstart); | 446 | break; |
452 | GNUNET_TESTBED_update_time_slot_ (data->p1->host, data->tslot_index, data, | ||
453 | duration, data->failed); | ||
454 | } | 447 | } |
455 | GNUNET_free (data); | 448 | GNUNET_free (data); |
456 | GNUNET_free (opc); | 449 | GNUNET_free (opc); |