diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-01-25 15:28:08 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-01-25 15:28:08 +0000 |
commit | 30c5c323f28ade8a1e7c6c593778793e44accb3a (patch) | |
tree | 845955ec895d221338b44f0cadce7932932e78cc /src/testbed/testbed_api.h | |
parent | 43d558efd13a3245e65efd0acdc9c4ba59cd2bee (diff) | |
download | gnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.tar.gz gnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.zip |
- indent
Diffstat (limited to 'src/testbed/testbed_api.h')
-rw-r--r-- | src/testbed/testbed_api.h | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h index 7586ed28d..d6c04a6a2 100644 --- a/src/testbed/testbed_api.h +++ b/src/testbed/testbed_api.h | |||
@@ -86,7 +86,6 @@ enum OperationType | |||
86 | * Get slave config operation | 86 | * Get slave config operation |
87 | */ | 87 | */ |
88 | OP_GET_SLAVE_CONFIG | 88 | OP_GET_SLAVE_CONFIG |
89 | |||
90 | }; | 89 | }; |
91 | 90 | ||
92 | 91 | ||
@@ -193,7 +192,7 @@ struct TimeSlot | |||
193 | * A key to identify this timeslot | 192 | * A key to identify this timeslot |
194 | */ | 193 | */ |
195 | void *key; | 194 | void *key; |
196 | 195 | ||
197 | /** | 196 | /** |
198 | * Time | 197 | * Time |
199 | */ | 198 | */ |
@@ -305,7 +304,7 @@ struct GNUNET_TESTBED_Controller | |||
305 | 304 | ||
306 | /** | 305 | /** |
307 | * An array of timing slots; size should be equal to the current number of parallel | 306 | * An array of timing slots; size should be equal to the current number of parallel |
308 | * overlay connects | 307 | * overlay connects |
309 | */ | 308 | */ |
310 | struct TimeSlot *tslots; | 309 | struct TimeSlot *tslots; |
311 | 310 | ||
@@ -319,7 +318,7 @@ struct GNUNET_TESTBED_Controller | |||
319 | * The controller event mask | 318 | * The controller event mask |
320 | */ | 319 | */ |
321 | uint64_t event_mask; | 320 | uint64_t event_mask; |
322 | 321 | ||
323 | /** | 322 | /** |
324 | * Did we start the receive loop yet? | 323 | * Did we start the receive loop yet? |
325 | */ | 324 | */ |
@@ -396,8 +395,7 @@ GNUNET_TESTBED_operation_add_ (struct GNUNET_TESTBED_Operation *op); | |||
396 | * @return the initialization message | 395 | * @return the initialization message |
397 | */ | 396 | */ |
398 | struct GNUNET_TESTBED_HelperInit * | 397 | struct GNUNET_TESTBED_HelperInit * |
399 | GNUNET_TESTBED_create_helper_init_msg_ (const char *cname, | 398 | GNUNET_TESTBED_create_helper_init_msg_ (const char *cname, const char *hostname, |
400 | const char *hostname, | ||
401 | const struct GNUNET_CONFIGURATION_Handle | 399 | const struct GNUNET_CONFIGURATION_Handle |
402 | *cfg); | 400 | *cfg); |
403 | 401 | ||
@@ -510,9 +508,9 @@ struct GNUNET_TESTBED_Operation * | |||
510 | GNUNET_TESTBED_controller_link_2_ (void *op_cls, | 508 | GNUNET_TESTBED_controller_link_2_ (void *op_cls, |
511 | struct GNUNET_TESTBED_Controller *master, | 509 | struct GNUNET_TESTBED_Controller *master, |
512 | uint32_t delegated_host_id, | 510 | uint32_t delegated_host_id, |
513 | uint32_t slave_host_id, | 511 | uint32_t slave_host_id, const char *sxcfg, |
514 | const char *sxcfg, size_t sxcfg_size, | 512 | size_t sxcfg_size, size_t scfg_size, |
515 | size_t scfg_size, int is_subordinate); | 513 | int is_subordinate); |
516 | 514 | ||
517 | 515 | ||
518 | /** | 516 | /** |
@@ -536,12 +534,11 @@ GNUNET_TESTBED_controller_link_2_ (void *op_cls, | |||
536 | */ | 534 | */ |
537 | struct GNUNET_TESTBED_Operation * | 535 | struct GNUNET_TESTBED_Operation * |
538 | GNUNET_TESTBED_controller_link_ (void *op_cls, | 536 | GNUNET_TESTBED_controller_link_ (void *op_cls, |
539 | struct GNUNET_TESTBED_Controller *master, | 537 | struct GNUNET_TESTBED_Controller *master, |
540 | uint32_t delegated_host_id, | 538 | uint32_t delegated_host_id, |
541 | uint32_t slave_host_id, | 539 | uint32_t slave_host_id, |
542 | const struct GNUNET_CONFIGURATION_Handle | 540 | const struct GNUNET_CONFIGURATION_Handle |
543 | *slave_cfg, | 541 | *slave_cfg, int is_subordinate); |
544 | int is_subordinate); | ||
545 | 542 | ||
546 | 543 | ||
547 | /** | 544 | /** |
@@ -568,10 +565,8 @@ GNUNET_TESTBED_get_tslot_ (struct GNUNET_TESTBED_Controller *c, void *key); | |||
568 | */ | 565 | */ |
569 | void | 566 | void |
570 | GNUNET_TESTBED_update_time_slot_ (struct GNUNET_TESTBED_Controller *c, | 567 | GNUNET_TESTBED_update_time_slot_ (struct GNUNET_TESTBED_Controller *c, |
571 | unsigned int index, | 568 | unsigned int index, void *key, |
572 | void *key, | 569 | struct GNUNET_TIME_Relative time, int failed); |
573 | struct GNUNET_TIME_Relative time, | ||
574 | int failed); | ||
575 | 570 | ||
576 | 571 | ||
577 | /** | 572 | /** |
@@ -586,8 +581,7 @@ GNUNET_TESTBED_update_time_slot_ (struct GNUNET_TESTBED_Controller *c, | |||
586 | */ | 581 | */ |
587 | int | 582 | int |
588 | GNUNET_TESTBED_release_time_slot_ (struct GNUNET_TESTBED_Controller *c, | 583 | GNUNET_TESTBED_release_time_slot_ (struct GNUNET_TESTBED_Controller *c, |
589 | unsigned int index, | 584 | unsigned int index, void *key); |
590 | void *key); | ||
591 | 585 | ||
592 | 586 | ||
593 | 587 | ||