aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api_barriers.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-06-25 20:14:33 +0000
committerChristian Grothoff <christian@grothoff.org>2016-06-25 20:14:33 +0000
commit98764c99d4e56c8520ac5d1f3a056649fa2137fc (patch)
tree1ae83e64fb230b39bba7a9571c0bbeb0b469f5f7 /src/testbed/testbed_api_barriers.c
parent4a381daf63c41550306834dc605378bb39afc6da (diff)
downloadgnunet-98764c99d4e56c8520ac5d1f3a056649fa2137fc.tar.gz
gnunet-98764c99d4e56c8520ac5d1f3a056649fa2137fc.zip
-doxygen
Diffstat (limited to 'src/testbed/testbed_api_barriers.c')
-rw-r--r--src/testbed/testbed_api_barriers.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c
index fb70737be..824dbcdba 100644
--- a/src/testbed/testbed_api_barriers.c
+++ b/src/testbed/testbed_api_barriers.c
@@ -206,7 +206,8 @@ handle_barrier_status_ (struct GNUNET_TESTBED_Controller *c,
206 goto cleanup; 206 goto cleanup;
207 } 207 }
208 GNUNET_assert (NULL != barrier->cb); 208 GNUNET_assert (NULL != barrier->cb);
209 if ((GNUNET_YES == barrier->echo) && (GNUNET_TESTBED_BARRIERSTATUS_CROSSED == status)) 209 if ((GNUNET_YES == barrier->echo) &&
210 (GNUNET_TESTBED_BARRIERSTATUS_CROSSED == status))
210 GNUNET_TESTBED_queue_message_ (c, GNUNET_copy_message (&msg->header)); 211 GNUNET_TESTBED_queue_message_ (c, GNUNET_copy_message (&msg->header));
211 barrier->cb (barrier->cls, name, barrier, status, emsg); 212 barrier->cb (barrier->cls, name, barrier, status, emsg);
212 if (GNUNET_TESTBED_BARRIERSTATUS_INITIALISED == status) 213 if (GNUNET_TESTBED_BARRIERSTATUS_INITIALISED == status)
@@ -270,7 +271,8 @@ GNUNET_TESTBED_barrier_init_ (struct GNUNET_TESTBED_Controller *controller,
270 barrier->echo = echo; 271 barrier->echo = echo;
271 (void) memcpy (&barrier->key, &key, sizeof (struct GNUNET_HashCode)); 272 (void) memcpy (&barrier->key, &key, sizeof (struct GNUNET_HashCode));
272 GNUNET_assert (GNUNET_OK == 273 GNUNET_assert (GNUNET_OK ==
273 GNUNET_CONTAINER_multihashmap_put (barrier_map, &barrier->key, 274 GNUNET_CONTAINER_multihashmap_put (barrier_map,
275 &barrier->key,
274 barrier, 276 barrier,
275 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); 277 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
276 msize = name_len + sizeof (struct GNUNET_TESTBED_BarrierInit); 278 msize = name_len + sizeof (struct GNUNET_TESTBED_BarrierInit);
@@ -304,7 +306,8 @@ GNUNET_TESTBED_barrier_init (struct GNUNET_TESTBED_Controller *controller,
304 unsigned int quorum, 306 unsigned int quorum,
305 GNUNET_TESTBED_barrier_status_cb cb, void *cls) 307 GNUNET_TESTBED_barrier_status_cb cb, void *cls)
306{ 308{
307 return GNUNET_TESTBED_barrier_init_ (controller, name, quorum, cb, cls, GNUNET_YES); 309 return GNUNET_TESTBED_barrier_init_ (controller,
310 name, quorum, cb, cls, GNUNET_YES);
308} 311}
309 312
310 313
@@ -399,7 +402,8 @@ destroy_handle (struct GNUNET_TESTBED_BarrierWaitHandle *h)
399 * @param message received message; NULL on timeout or fatal error 402 * @param message received message; NULL on timeout or fatal error
400 */ 403 */
401static void 404static void
402receive_handler (void *cls, const struct GNUNET_MessageHeader *message) 405receive_handler (void *cls,
406 const struct GNUNET_MessageHeader *message)
403{ 407{
404 struct GNUNET_TESTBED_BarrierWaitHandle *h = cls; 408 struct GNUNET_TESTBED_BarrierWaitHandle *h = cls;
405 const struct GNUNET_TESTBED_BarrierStatusMsg *msg; 409 const struct GNUNET_TESTBED_BarrierStatusMsg *msg;
@@ -524,7 +528,8 @@ GNUNET_TESTBED_barrier_wait (const char *name,
524 h->cls = cls; 528 h->cls = cls;
525 if (NULL == h->conn) 529 if (NULL == h->conn)
526 { 530 {
527 LOG (GNUNET_ERROR_TYPE_ERROR, "Unable to connect to local testbed-barrier service\n"); 531 LOG (GNUNET_ERROR_TYPE_ERROR,
532 "Unable to connect to local testbed-barrier service\n");
528 destroy_handle (h); 533 destroy_handle (h);
529 return NULL; 534 return NULL;
530 } 535 }