diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-08-13 19:49:15 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-08-13 19:49:15 +0000 |
commit | 95f88454036d5b6637edab1544d227c9eda62790 (patch) | |
tree | 5f0c40f53683a7ad97e5b613f50bbece1dba33e0 /src/testbed | |
parent | 39b82864a1ac0d4fd01cdb69b2fcfb46dd79ec25 (diff) | |
download | gnunet-95f88454036d5b6637edab1544d227c9eda62790.tar.gz gnunet-95f88454036d5b6637edab1544d227c9eda62790.zip |
-use new_array where appropriate, fix indentation
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/testbed_api_topology.c | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c index c86dd2739..76272832d 100644 --- a/src/testbed/testbed_api_topology.c +++ b/src/testbed/testbed_api_topology.c | |||
@@ -346,7 +346,8 @@ static const char *topology_strings[] = { | |||
346 | * operation has executed successfully. | 346 | * operation has executed successfully. |
347 | */ | 347 | */ |
348 | static void | 348 | static void |
349 | overlay_link_completed (void *cls, struct GNUNET_TESTBED_Operation *op, | 349 | overlay_link_completed (void *cls, |
350 | struct GNUNET_TESTBED_Operation *op, | ||
350 | const char *emsg) | 351 | const char *emsg) |
351 | { | 352 | { |
352 | struct OverlayLink *link = cls; | 353 | struct OverlayLink *link = cls; |
@@ -366,10 +367,13 @@ overlay_link_completed (void *cls, struct GNUNET_TESTBED_Operation *op, | |||
366 | if (0 != overlay->retry_cnt) | 367 | if (0 != overlay->retry_cnt) |
367 | { | 368 | { |
368 | LOG (GNUNET_ERROR_TYPE_WARNING, | 369 | LOG (GNUNET_ERROR_TYPE_WARNING, |
369 | "Error while establishing a link: %s -- Retrying\n", emsg); | 370 | "Error while establishing a link: %s -- Retrying\n", |
371 | emsg); | ||
370 | retry_entry = GNUNET_new (struct RetryListEntry); | 372 | retry_entry = GNUNET_new (struct RetryListEntry); |
371 | retry_entry->link = link; | 373 | retry_entry->link = link; |
372 | GNUNET_CONTAINER_DLL_insert_tail (overlay->rl_head, overlay->rl_tail, retry_entry); | 374 | GNUNET_CONTAINER_DLL_insert_tail (overlay->rl_head, |
375 | overlay->rl_tail, | ||
376 | retry_entry); | ||
373 | } | 377 | } |
374 | } | 378 | } |
375 | else | 379 | else |
@@ -386,18 +390,24 @@ overlay_link_completed (void *cls, struct GNUNET_TESTBED_Operation *op, | |||
386 | { | 390 | { |
387 | link = retry_entry->link; | 391 | link = retry_entry->link; |
388 | link->op = | 392 | link->op = |
389 | GNUNET_TESTBED_overlay_connect (overlay->op_cls, &overlay_link_completed, | 393 | GNUNET_TESTBED_overlay_connect (overlay->op_cls, |
390 | link, overlay->peers[link->A], | 394 | &overlay_link_completed, |
395 | link, | ||
396 | overlay->peers[link->A], | ||
391 | overlay->peers[link->B]); | 397 | overlay->peers[link->B]); |
392 | overlay->nlinks++; | 398 | overlay->nlinks++; |
393 | GNUNET_CONTAINER_DLL_remove (overlay->rl_head, overlay->rl_tail, retry_entry); | 399 | GNUNET_CONTAINER_DLL_remove (overlay->rl_head, |
400 | overlay->rl_tail, | ||
401 | retry_entry); | ||
394 | GNUNET_free (retry_entry); | 402 | GNUNET_free (retry_entry); |
395 | } | 403 | } |
396 | return; | 404 | return; |
397 | } | 405 | } |
398 | if (NULL != overlay->comp_cb) | 406 | if (NULL != overlay->comp_cb) |
399 | { | 407 | { |
400 | overlay->comp_cb (overlay->comp_cb_cls, overlay->nsuccess, overlay->nfailures); | 408 | overlay->comp_cb (overlay->comp_cb_cls, |
409 | overlay->nsuccess, | ||
410 | overlay->nfailures); | ||
401 | } | 411 | } |
402 | } | 412 | } |
403 | 413 | ||
@@ -421,7 +431,8 @@ opstart_overlay_configure_topology (void *cls) | |||
421 | for (p = 0; p < tc->link_array_size; p++) | 431 | for (p = 0; p < tc->link_array_size; p++) |
422 | { | 432 | { |
423 | overlay->link_array[p].op = | 433 | overlay->link_array[p].op = |
424 | GNUNET_TESTBED_overlay_connect (overlay->op_cls, &overlay_link_completed, | 434 | GNUNET_TESTBED_overlay_connect (overlay->op_cls, |
435 | &overlay_link_completed, | ||
425 | &overlay->link_array[p], | 436 | &overlay->link_array[p], |
426 | overlay->peers[overlay->link_array[p].A], | 437 | overlay->peers[overlay->link_array[p].A], |
427 | overlay->peers[overlay->link_array[p].B]); | 438 | overlay->peers[overlay->link_array[p].B]); |
@@ -470,7 +481,9 @@ oprelease_overlay_configure_topology (void *cls) | |||
470 | * @return | 481 | * @return |
471 | */ | 482 | */ |
472 | static void | 483 | static void |
473 | make_link (unsigned int offset, uint32_t A, uint32_t B, | 484 | make_link (unsigned int offset, |
485 | uint32_t A, | ||
486 | uint32_t B, | ||
474 | struct TopologyContext *tc) | 487 | struct TopologyContext *tc) |
475 | { | 488 | { |
476 | GNUNET_assert (A != B); | 489 | GNUNET_assert (A != B); |
@@ -526,7 +539,8 @@ gen_topo_line (struct TopologyContext *tc) | |||
526 | 539 | ||
527 | overlay = &tc->u.overlay; | 540 | overlay = &tc->u.overlay; |
528 | overlay->link_array = | 541 | overlay->link_array = |
529 | GNUNET_malloc (sizeof (struct OverlayLink) * tc->link_array_size); | 542 | GNUNET_new_array (tc->link_array_size, |
543 | struct OverlayLink); | ||
530 | } | 544 | } |
531 | break; | 545 | break; |
532 | case TOPOLOGYCONTEXT_TYPE_UNDERLAY: | 546 | case TOPOLOGYCONTEXT_TYPE_UNDERLAY: |
@@ -535,7 +549,8 @@ gen_topo_line (struct TopologyContext *tc) | |||
535 | 549 | ||
536 | underlay = &tc->u.underlay; | 550 | underlay = &tc->u.underlay; |
537 | underlay->link_array = | 551 | underlay->link_array = |
538 | GNUNET_malloc (sizeof (struct UnderlayLink) * tc->link_array_size); | 552 | GNUNET_new_array (tc->link_array_size, |
553 | struct UnderlayLink); | ||
539 | } | 554 | } |
540 | break; | 555 | break; |
541 | } | 556 | } |
@@ -563,7 +578,8 @@ gen_topo_star (struct TopologyContext *tc) | |||
563 | 578 | ||
564 | overlay = &tc->u.overlay; | 579 | overlay = &tc->u.overlay; |
565 | overlay->link_array = | 580 | overlay->link_array = |
566 | GNUNET_malloc (sizeof (struct OverlayLink) * tc->link_array_size); | 581 | GNUNET_new_array (tc->link_array_size, |
582 | struct OverlayLink); | ||
567 | } | 583 | } |
568 | break; | 584 | break; |
569 | case TOPOLOGYCONTEXT_TYPE_UNDERLAY: | 585 | case TOPOLOGYCONTEXT_TYPE_UNDERLAY: |
@@ -572,12 +588,16 @@ gen_topo_star (struct TopologyContext *tc) | |||
572 | 588 | ||
573 | underlay = &tc->u.underlay; | 589 | underlay = &tc->u.underlay; |
574 | underlay->link_array = | 590 | underlay->link_array = |
575 | GNUNET_malloc (sizeof (struct UnderlayLink) * tc->link_array_size); | 591 | GNUNET_new_array (tc->link_array_size, |
592 | struct UnderlayLink); | ||
576 | } | 593 | } |
577 | break; | 594 | break; |
578 | } | 595 | } |
579 | for (cnt = tc->link_array_size; cnt; cnt--) | 596 | for (cnt = tc->link_array_size; cnt; cnt--) |
580 | make_link (0, 0, cnt, tc); | 597 | make_link (0, |
598 | 0, | ||
599 | cnt, | ||
600 | tc); | ||
581 | } | 601 | } |
582 | 602 | ||
583 | 603 | ||