diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-04-18 08:17:01 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-04-18 08:17:01 +0000 |
commit | 6c4a5cf1b0ba02f99df557dd693af968ae65dcac (patch) | |
tree | 0980be375269391171b1cf691ca712f8f74981ec | |
parent | 397c5f9f507237860cec4dfcc5c701cc359a0275 (diff) | |
download | gnunet-6c4a5cf1b0ba02f99df557dd693af968ae65dcac.tar.gz gnunet-6c4a5cf1b0ba02f99df557dd693af968ae65dcac.zip |
- doxygen
-rw-r--r-- | src/include/gnunet_testbed_service.h | 8 | ||||
-rw-r--r-- | src/testbed/testbed_api.c | 4 | ||||
-rw-r--r-- | src/testbed/testbed_api_operations.c | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index 437d0d655..9b92d4856 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h | |||
@@ -524,10 +524,10 @@ GNUNET_TESTBED_controller_configure_sharing (struct GNUNET_TESTBED_Controller *c | |||
524 | * controllers dependent on this controller). This function | 524 | * controllers dependent on this controller). This function |
525 | * blocks until the testbed has been fully terminated (!). | 525 | * blocks until the testbed has been fully terminated (!). |
526 | * | 526 | * |
527 | * @param controller handle to controller to stop | 527 | * @param c handle to controller to stop |
528 | */ | 528 | */ |
529 | void | 529 | void |
530 | GNUNET_TESTBED_controller_disconnect (struct GNUNET_TESTBED_Controller *controller); | 530 | GNUNET_TESTBED_controller_disconnect (struct GNUNET_TESTBED_Controller *c); |
531 | 531 | ||
532 | 532 | ||
533 | /** | 533 | /** |
@@ -911,7 +911,7 @@ GNUNET_TESTBED_peer_manage_service (void *op_cls, | |||
911 | * when there are no other pending operations. If there are pending operations, | 911 | * when there are no other pending operations. If there are pending operations, |
912 | * it will return NULL | 912 | * it will return NULL |
913 | * | 913 | * |
914 | * @param controller the controller to send this message to | 914 | * @param c the controller to send this message to |
915 | * @param op_cls closure for the operation | 915 | * @param op_cls closure for the operation |
916 | * @param cb the callback to call when all peers are stopped and destroyed | 916 | * @param cb the callback to call when all peers are stopped and destroyed |
917 | * @param cb_cls the closure for the callback | 917 | * @param cb_cls the closure for the callback |
@@ -919,7 +919,7 @@ GNUNET_TESTBED_peer_manage_service (void *op_cls, | |||
919 | * present | 919 | * present |
920 | */ | 920 | */ |
921 | struct GNUNET_TESTBED_Operation * | 921 | struct GNUNET_TESTBED_Operation * |
922 | GNUNET_TESTBED_shutdown_peers (struct GNUNET_TESTBED_Controller *controller, | 922 | GNUNET_TESTBED_shutdown_peers (struct GNUNET_TESTBED_Controller *c, |
923 | void *op_cls, | 923 | void *op_cls, |
924 | GNUNET_TESTBED_OperationCompletionCallback cb, | 924 | GNUNET_TESTBED_OperationCompletionCallback cb, |
925 | void *cb_cls); | 925 | void *cb_cls); |
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index e9a70abb3..fda47e5f8 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -1573,7 +1573,9 @@ opc_free_iterator (void *cls, uint32_t key, void *value) | |||
1573 | 1573 | ||
1574 | 1574 | ||
1575 | /** | 1575 | /** |
1576 | * disconnects from the controller. | 1576 | * Stop the given controller (also will terminate all peers and |
1577 | * controllers dependent on this controller). This function | ||
1578 | * blocks until the testbed has been fully terminated (!). | ||
1577 | * | 1579 | * |
1578 | * @param c handle to controller to stop | 1580 | * @param c handle to controller to stop |
1579 | */ | 1581 | */ |
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index fd1df0e76..47d135ffd 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c | |||
@@ -547,9 +547,6 @@ merge_ops (struct GNUNET_TESTBED_Operation ***old, | |||
547 | * Checks for the readiness of an operation and schedules a operation start task | 547 | * Checks for the readiness of an operation and schedules a operation start task |
548 | * | 548 | * |
549 | * @param op the operation | 549 | * @param op the operation |
550 | * @param GNUNET_NO if the given operation cannot be made active; GNUNET_YES if | ||
551 | * it can be activated (has enough resources) and is kept in ready | ||
552 | * queue | ||
553 | */ | 550 | */ |
554 | static int | 551 | static int |
555 | check_readiness (struct GNUNET_TESTBED_Operation *op) | 552 | check_readiness (struct GNUNET_TESTBED_Operation *op) |