aboutsummaryrefslogtreecommitdiff
path: root/src/testing/testing_api_cmd_netjail_start_cmds_helper.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing/testing_api_cmd_netjail_start_cmds_helper.c')
-rw-r--r--src/testing/testing_api_cmd_netjail_start_cmds_helper.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/testing/testing_api_cmd_netjail_start_cmds_helper.c b/src/testing/testing_api_cmd_netjail_start_cmds_helper.c
index f1ef9fef1..51a20dd9b 100644
--- a/src/testing/testing_api_cmd_netjail_start_cmds_helper.c
+++ b/src/testing/testing_api_cmd_netjail_start_cmds_helper.c
@@ -293,7 +293,6 @@ send_message_to_locals (
293 helper = ns->helper[count - 1]; 293 helper = ns->helper[count - 1];
294 294
295 295
296
297 struct GNUNET_HELPER_SendHandle *sh = GNUNET_HELPER_send ( 296 struct GNUNET_HELPER_SendHandle *sh = GNUNET_HELPER_send (
298 (struct GNUNET_HELPER_Handle *) helper, 297 (struct GNUNET_HELPER_Handle *) helper,
299 header, 298 header,
@@ -385,7 +384,7 @@ barrier_reached (struct NetJailState *ns, const struct
385 *) message; 384 *) message;
386 385
387 barrier_name = (const char *) &rm[1]; 386 barrier_name = (const char *) &rm[1];
388 387
389 barrier = TST_interpreter_get_barrier (ns->is, barrier_name); 388 barrier = TST_interpreter_get_barrier (ns->is, barrier_name);
390 GNUNET_assert (NULL != barrier); 389 GNUNET_assert (NULL != barrier);
391 LOG (GNUNET_ERROR_TYPE_DEBUG, 390 LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -396,13 +395,13 @@ barrier_reached (struct NetJailState *ns, const struct
396 barrier->reached++; 395 barrier->reached++;
397 LOG (GNUNET_ERROR_TYPE_DEBUG, 396 LOG (GNUNET_ERROR_TYPE_DEBUG,
398 "%u %p\n", 397 "%u %p\n",
399 barrier->reached, 398 barrier->reached,
400 barrier); 399 barrier);
401 if (GNUNET_TESTING_barrier_crossable (barrier)) 400 if (GNUNET_TESTING_barrier_crossable (barrier))
402 { 401 {
403 LOG (GNUNET_ERROR_TYPE_DEBUG, 402 LOG (GNUNET_ERROR_TYPE_DEBUG,
404 "%s can be crossed\n", 403 "%s can be crossed\n",
405 barrier_name); 404 barrier_name);
406 TST_interpreter_finish_attached_cmds (ns->is, barrier->name); 405 TST_interpreter_finish_attached_cmds (ns->is, barrier->name);
407 } 406 }
408 LOG (GNUNET_ERROR_TYPE_DEBUG, 407 LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -485,7 +484,8 @@ helper_mst (void *cls, const struct GNUNET_MessageHeader *message)
485 if (GNUNET_OK != lf->rv) 484 if (GNUNET_OK != lf->rv)
486 { 485 {
487 GNUNET_TESTING_async_fail (&(ns->ac)); 486 GNUNET_TESTING_async_fail (&(ns->ac));
488 } else if (ns->number_of_local_tests_finished == total_number) 487 }
488 else if (ns->number_of_local_tests_finished == total_number)
489 { 489 {
490 GNUNET_SCHEDULER_cancel (ns->timeout_task); 490 GNUNET_SCHEDULER_cancel (ns->timeout_task);
491 ns->timeout_task = NULL; 491 ns->timeout_task = NULL;
@@ -509,8 +509,6 @@ helper_mst (void *cls, const struct GNUNET_MessageHeader *message)
509 ns->known); 509 ns->known);
510 510
511 511
512
513
514 return GNUNET_OK; 512 return GNUNET_OK;
515} 513}
516 514
@@ -737,22 +735,22 @@ start_helper (struct NetJailState *ns,
737 if (NULL == barrier) 735 if (NULL == barrier)
738 { 736 {
739 LOG (GNUNET_ERROR_TYPE_DEBUG, 737 LOG (GNUNET_ERROR_TYPE_DEBUG,
740 "barrier %s added\n", 738 "barrier %s added\n",
741 pos->barrier_name); 739 pos->barrier_name);
742 barrier = GNUNET_new (struct GNUNET_TESTING_Barrier); 740 barrier = GNUNET_new (struct GNUNET_TESTING_Barrier);
743 barrier->name = pos->barrier_name; 741 barrier->name = pos->barrier_name;
744 barrier->shadow = GNUNET_YES; 742 barrier->shadow = GNUNET_YES;
745 TST_interpreter_add_barrier (ns->is, barrier); 743 TST_interpreter_add_barrier (ns->is, barrier);
746 744
747 LOG (GNUNET_ERROR_TYPE_DEBUG, 745 LOG (GNUNET_ERROR_TYPE_DEBUG,
748 "%u %p\n", 746 "%u %p\n",
749 barrier->reached, 747 barrier->reached,
750 barrier); 748 barrier);
751 749
752 barrier->nodes = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO); 750 barrier->nodes = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
753 } 751 }
754 LOG (GNUNET_ERROR_TYPE_DEBUG, 752 LOG (GNUNET_ERROR_TYPE_DEBUG,
755 "barrier %p %s node %u added \n", 753 "barrier %p %s node %u added \n",
756 barrier, 754 barrier,
757 pos->barrier_name, 755 pos->barrier_name,
758 node->node_number); 756 node->node_number);
@@ -859,7 +857,7 @@ netjail_exec_run (void *cls,
859 for (int j = 1; j <= ns->local_m; j++) 857 for (int j = 1; j <= ns->local_m; j++)
860 { 858 {
861 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 859 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
862 "i %u j %u\n", 860 "i %u j %u\n",
863 i, 861 i,
864 j); 862 j);
865 start_helper (ns, 863 start_helper (ns,