diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-09-18 08:25:07 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-09-18 08:25:07 +0000 |
commit | 3b87d25950fab10dc431e90ae80d3f75bce09ffc (patch) | |
tree | 78ab8993139dfb5294b71684c316cd6297e1c327 /src | |
parent | f2ae20126c316952ea414594f2f6ff0a0f54ee45 (diff) | |
download | gnunet-3b87d25950fab10dc431e90ae80d3f75bce09ffc.tar.gz gnunet-3b87d25950fab10dc431e90ae80d3f75bce09ffc.zip |
cleanup logging
blacklist sam and fulcrum from connecting
Diffstat (limited to 'src')
-rw-r--r-- | src/ats-tests/perf_ats.c | 36 | ||||
-rw-r--r-- | src/ats-tests/template_perf_ats.conf | 18 |
2 files changed, 36 insertions, 18 deletions
diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c index 0b0bb19a6..54afd447b 100644 --- a/src/ats-tests/perf_ats.c +++ b/src/ats-tests/perf_ats.c | |||
@@ -526,14 +526,15 @@ connect_completion_callback (void *cls, struct GNUNET_TESTBED_Operation *op, | |||
526 | if (NULL == emsg) | 526 | if (NULL == emsg) |
527 | { | 527 | { |
528 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 528 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, |
529 | _("Connected master peer %u with peer %u\n"), cop->master->no, | 529 | _("Connected master [%u] with slave [%u]\n"), |
530 | cop->master->no, | ||
530 | cop->slave->no); | 531 | cop->slave->no); |
531 | } | 532 | } |
532 | else | 533 | else |
533 | { | 534 | { |
534 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | 535 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, |
535 | _("Failed to connect master peer%u with peer %u\n"), cop->master->no, | 536 | _("Failed to connect master peer [%u] with slave [%u]\n"), |
536 | cop->slave->no); | 537 | cop->master->no, cop->slave->no); |
537 | GNUNET_break(0); | 538 | GNUNET_break(0); |
538 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) | 539 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) |
539 | GNUNET_SCHEDULER_cancel (shutdown_task); | 540 | GNUNET_SCHEDULER_cancel (shutdown_task); |
@@ -563,9 +564,7 @@ do_connect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
563 | 564 | ||
564 | if ((state.connected_ATS_service == GNUNET_NO) | 565 | if ((state.connected_ATS_service == GNUNET_NO) |
565 | || (state.connected_CORE_service == GNUNET_NO)) | 566 | || (state.connected_CORE_service == GNUNET_NO)) |
566 | { | ||
567 | return; | 567 | return; |
568 | } | ||
569 | 568 | ||
570 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Connecting peers on CORE level\n")); | 569 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Connecting peers on CORE level\n")); |
571 | 570 | ||
@@ -578,7 +577,7 @@ do_connect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
578 | for (c_s = 0; c_s < num_slaves; c_s++) | 577 | for (c_s = 0; c_s < num_slaves; c_s++) |
579 | { | 578 | { |
580 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 579 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, |
581 | _("Connecting master peer %u with slave peer %u\n"), p->no, | 580 | _("Connecting master [%u] with slave [%u]\n"), p->no, |
582 | sps[c_s].no); | 581 | sps[c_s].no); |
583 | p->core_connect_ops[c_s].master = p; | 582 | p->core_connect_ops[c_s].master = p; |
584 | p->core_connect_ops[c_s].slave = &sps[c_s]; | 583 | p->core_connect_ops[c_s].slave = &sps[c_s]; |
@@ -588,7 +587,7 @@ do_connect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
588 | if (NULL == p->core_connect_ops[c_s].connect_op) | 587 | if (NULL == p->core_connect_ops[c_s].connect_op) |
589 | { | 588 | { |
590 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | 589 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, |
591 | _("Could not connect master peer %u and slave peer %u\n"), p->no, | 590 | _("Could not connect master [%u] and slave [%u]\n"), p->no, |
592 | sps[c_s].no); | 591 | sps[c_s].no); |
593 | GNUNET_break(0); | 592 | GNUNET_break(0); |
594 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) | 593 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) |
@@ -611,32 +610,32 @@ static void | |||
611 | core_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) | 610 | core_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) |
612 | { | 611 | { |
613 | struct BenchmarkPeer *p = cls; | 612 | struct BenchmarkPeer *p = cls; |
614 | struct BenchmarkPeer *t; | 613 | struct BenchmarkPeer *remote; |
615 | char *id; | 614 | char *id; |
616 | int c; | 615 | int c; |
617 | int completed; | 616 | int completed; |
618 | 617 | ||
619 | t = find_peer (peer); | 618 | remote = find_peer (peer); |
620 | if (NULL == t) | 619 | if (NULL == remote) |
621 | { | 620 | { |
622 | GNUNET_break(0); | 621 | GNUNET_break(0); |
623 | return; | 622 | return; |
624 | } | 623 | } |
625 | 624 | ||
626 | id = GNUNET_strdup (GNUNET_i2s (&p->id)); | 625 | id = GNUNET_strdup (GNUNET_i2s (&p->id)); |
627 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s %s connected to %s %s\n", | 626 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s [%u] `%s' connected to %s [%u] %s\n", |
628 | (p->master == GNUNET_YES) ? "Master": "Slave", id, | 627 | (p->master == GNUNET_YES) ? "Master": "Slave", p->no, id, |
629 | (t->master == GNUNET_YES) ? "Master": "Slave", GNUNET_i2s (peer)); | 628 | (remote->master == GNUNET_YES) ? "Master": "Slave", remote->no, GNUNET_i2s (peer)); |
630 | 629 | ||
631 | p->core_connections++; | 630 | p->core_connections++; |
632 | if ((GNUNET_YES == p->master) && (GNUNET_NO == t->master) | 631 | if ((GNUNET_YES == p->master) && (GNUNET_NO == remote->master) |
633 | && (GNUNET_NO == state.connected_CORE)) | 632 | && (GNUNET_NO == state.connected_CORE)) |
634 | { | 633 | { |
635 | p->mi.core_slave_connections++; | 634 | p->mi.core_slave_connections++; |
636 | 635 | ||
637 | if (p->mi.core_slave_connections == num_slaves) | 636 | if (p->mi.core_slave_connections == num_slaves) |
638 | { | 637 | { |
639 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Master %u connected all slaves\n", | 638 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Master [%u] connected all slaves\n", |
640 | p->no); | 639 | p->no); |
641 | } | 640 | } |
642 | completed = GNUNET_YES; | 641 | completed = GNUNET_YES; |
@@ -983,8 +982,9 @@ peerinformation_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op, | |||
983 | GNUNET_assert (pinfo->pit == GNUNET_TESTBED_PIT_IDENTITY); | 982 | GNUNET_assert (pinfo->pit == GNUNET_TESTBED_PIT_IDENTITY); |
984 | 983 | ||
985 | p->id = *pinfo->result.id; | 984 | p->id = *pinfo->result.id; |
986 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, "[%c %03u] Peers %s\n", | 985 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, "%s [%u] has peer id `%s'\n", |
987 | (p->master == GNUNET_YES) ? 'M' : 'S', p->no, GNUNET_i2s (&p->id)); | 986 | (p->master == GNUNET_YES) ? "Master" : "Slave", |
987 | p->no, GNUNET_i2s_full (&p->id)); | ||
988 | 988 | ||
989 | GNUNET_TESTBED_operation_done (op); | 989 | GNUNET_TESTBED_operation_done (op); |
990 | p->peer_id_op = NULL; | 990 | p->peer_id_op = NULL; |
@@ -1168,6 +1168,8 @@ main (int argc, char *argv[]) | |||
1168 | state.connected_ATS_service = GNUNET_NO; | 1168 | state.connected_ATS_service = GNUNET_NO; |
1169 | state.connected_CORE_service = GNUNET_NO; | 1169 | state.connected_CORE_service = GNUNET_NO; |
1170 | state.connected_PEERS = GNUNET_NO; | 1170 | state.connected_PEERS = GNUNET_NO; |
1171 | state.benchmarking = GNUNET_NO; | ||
1172 | state.connected_PEERS = GNUNET_NO; | ||
1171 | 1173 | ||
1172 | mps = GNUNET_malloc (num_masters * sizeof (struct BenchmarkPeer)); | 1174 | mps = GNUNET_malloc (num_masters * sizeof (struct BenchmarkPeer)); |
1173 | sps = GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPeer)); | 1175 | sps = GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPeer)); |
diff --git a/src/ats-tests/template_perf_ats.conf b/src/ats-tests/template_perf_ats.conf index ce1902285..e00bdc391 100644 --- a/src/ats-tests/template_perf_ats.conf +++ b/src/ats-tests/template_perf_ats.conf | |||
@@ -25,4 +25,20 @@ WLAN_QUOTA_IN = 128 KiB | |||
25 | WLAN_QUOTA_OUT = 128 KiB | 25 | WLAN_QUOTA_OUT = 128 KiB |
26 | # BLUETOOTH | 26 | # BLUETOOTH |
27 | BLUETOOTH_QUOTA_IN = 128 KiB | 27 | BLUETOOTH_QUOTA_IN = 128 KiB |
28 | BLUETOOTH_QUOTA_OUT = 128 KiB \ No newline at end of file | 28 | BLUETOOTH_QUOTA_OUT = 128 KiB |
29 | |||
30 | [transport-blacklist-M1RGJB4FQSM17JJ3M9BF7Q0I8MCO8C462NMOHI26RLT7C7A2KE6HCOPRA4ARM5HPL1J9IDDK5G8SFU5GUSHCTBH90ECETK1BFQD76R0] | ||
31 | HIJN5O404QNUR37OSJUTNJ6H2KJS198DHI2J3I8SE3DMKVRG1RNQPODN1IJBF14KEMPPPRM0B9F9ILFKHOFCA655CH6M5OCNCMR0FE0 = | ||
32 | CDTU8QQ8UPLGHR3B91V0CLTDOHONLB8QGHGUEM2JM1GANTEV0O6T20SD2N2HDN2QSHDG6IDTBR48KRDCS601FI6VHG59E7DQA98JD2O = | ||
33 | |||
34 | [transport-blacklist-93ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O] | ||
35 | HIJN5O404QNUR37OSJUTNJ6H2KJS198DHI2J3I8SE3DMKVRG1RNQPODN1IJBF14KEMPPPRM0B9F9ILFKHOFCA655CH6M5OCNCMR0FE0 = | ||
36 | CDTU8QQ8UPLGHR3B91V0CLTDOHONLB8QGHGUEM2JM1GANTEV0O6T20SD2N2HDN2QSHDG6IDTBR48KRDCS601FI6VHG59E7DQA98JD2O = | ||
37 | |||
38 | [transport-blacklist-OF84RAOAU2B1SOSEHJH6350MA0F7C98U55RI76LGIQOM7O33TFHPNUFB47CDBSCOLIINMVJ2U82445ABOBQRIVREG20L31KVDV5HG60] | ||
39 | HIJN5O404QNUR37OSJUTNJ6H2KJS198DHI2J3I8SE3DMKVRG1RNQPODN1IJBF14KEMPPPRM0B9F9ILFKHOFCA655CH6M5OCNCMR0FE0 = | ||
40 | CDTU8QQ8UPLGHR3B91V0CLTDOHONLB8QGHGUEM2JM1GANTEV0O6T20SD2N2HDN2QSHDG6IDTBR48KRDCS601FI6VHG59E7DQA98JD2O = | ||
41 | |||
42 | [transport-blacklist-548J7M14O4I0F8I84U0UFARVJ97DB6QOT3MCA8O8SNAIT5JJ8TR95LUVAP3N5L7DN33IB49SNMF3Q3C0VPLTGP9ASCULA9S2OIMHHH8] | ||
43 | HIJN5O404QNUR37OSJUTNJ6H2KJS198DHI2J3I8SE3DMKVRG1RNQPODN1IJBF14KEMPPPRM0B9F9ILFKHOFCA655CH6M5OCNCMR0FE0 = | ||
44 | CDTU8QQ8UPLGHR3B91V0CLTDOHONLB8QGHGUEM2JM1GANTEV0O6T20SD2N2HDN2QSHDG6IDTBR48KRDCS601FI6VHG59E7DQA98JD2O = \ No newline at end of file | ||