[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29364 - gnunet/src/ats-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29364 - gnunet/src/ats-tests |
Date: |
Wed, 18 Sep 2013 10:25:07 +0200 |
Author: wachs
Date: 2013-09-18 10:25:07 +0200 (Wed, 18 Sep 2013)
New Revision: 29364
Modified:
gnunet/src/ats-tests/perf_ats.c
gnunet/src/ats-tests/template_perf_ats.conf
Log:
cleanup logging
blacklist sam and fulcrum from connecting
Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c 2013-09-18 08:12:00 UTC (rev 29363)
+++ gnunet/src/ats-tests/perf_ats.c 2013-09-18 08:25:07 UTC (rev 29364)
@@ -526,14 +526,15 @@
if (NULL == emsg)
{
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- _("Connected master peer %u with peer %u\n"), cop->master->no,
+ _("Connected master [%u] with slave [%u]\n"),
+ cop->master->no,
cop->slave->no);
}
else
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- _("Failed to connect master peer%u with peer %u\n"), cop->master->no,
- cop->slave->no);
+ _("Failed to connect master peer [%u] with slave [%u]\n"),
+ cop->master->no, cop->slave->no);
GNUNET_break(0);
if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
GNUNET_SCHEDULER_cancel (shutdown_task);
@@ -563,9 +564,7 @@
if ((state.connected_ATS_service == GNUNET_NO)
|| (state.connected_CORE_service == GNUNET_NO))
- {
return;
- }
GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Connecting peers on CORE level\n"));
@@ -578,7 +577,7 @@
for (c_s = 0; c_s < num_slaves; c_s++)
{
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- _("Connecting master peer %u with slave peer %u\n"), p->no,
+ _("Connecting master [%u] with slave [%u]\n"), p->no,
sps[c_s].no);
p->core_connect_ops[c_s].master = p;
p->core_connect_ops[c_s].slave = &sps[c_s];
@@ -588,7 +587,7 @@
if (NULL == p->core_connect_ops[c_s].connect_op)
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- _("Could not connect master peer %u and slave peer %u\n"), p->no,
+ _("Could not connect master [%u] and slave [%u]\n"), p->no,
sps[c_s].no);
GNUNET_break(0);
if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
@@ -611,32 +610,32 @@
core_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer)
{
struct BenchmarkPeer *p = cls;
- struct BenchmarkPeer *t;
+ struct BenchmarkPeer *remote;
char *id;
int c;
int completed;
- t = find_peer (peer);
- if (NULL == t)
+ remote = find_peer (peer);
+ if (NULL == remote)
{
GNUNET_break(0);
return;
}
id = GNUNET_strdup (GNUNET_i2s (&p->id));
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s %s connected to %s %s\n",
- (p->master == GNUNET_YES) ? "Master": "Slave", id,
- (t->master == GNUNET_YES) ? "Master": "Slave", GNUNET_i2s (peer));
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s [%u] `%s' connected to %s [%u] %s\n",
+ (p->master == GNUNET_YES) ? "Master": "Slave", p->no, id,
+ (remote->master == GNUNET_YES) ? "Master": "Slave", remote->no,
GNUNET_i2s (peer));
p->core_connections++;
- if ((GNUNET_YES == p->master) && (GNUNET_NO == t->master)
+ if ((GNUNET_YES == p->master) && (GNUNET_NO == remote->master)
&& (GNUNET_NO == state.connected_CORE))
{
p->mi.core_slave_connections++;
if (p->mi.core_slave_connections == num_slaves)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Master %u connected all slaves\n",
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Master [%u] connected all slaves\n",
p->no);
}
completed = GNUNET_YES;
@@ -983,8 +982,9 @@
GNUNET_assert (pinfo->pit == GNUNET_TESTBED_PIT_IDENTITY);
p->id = *pinfo->result.id;
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "[%c %03u] Peers %s\n",
- (p->master == GNUNET_YES) ? 'M' : 'S', p->no, GNUNET_i2s (&p->id));
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO, "%s [%u] has peer id `%s'\n",
+ (p->master == GNUNET_YES) ? "Master" : "Slave",
+ p->no, GNUNET_i2s_full (&p->id));
GNUNET_TESTBED_operation_done (op);
p->peer_id_op = NULL;
@@ -1168,6 +1168,8 @@
state.connected_ATS_service = GNUNET_NO;
state.connected_CORE_service = GNUNET_NO;
state.connected_PEERS = GNUNET_NO;
+ state.benchmarking = GNUNET_NO;
+ state.connected_PEERS = GNUNET_NO;
mps = GNUNET_malloc (num_masters * sizeof (struct BenchmarkPeer));
sps = GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPeer));
Modified: gnunet/src/ats-tests/template_perf_ats.conf
===================================================================
--- gnunet/src/ats-tests/template_perf_ats.conf 2013-09-18 08:12:00 UTC (rev
29363)
+++ gnunet/src/ats-tests/template_perf_ats.conf 2013-09-18 08:25:07 UTC (rev
29364)
@@ -25,4 +25,20 @@
WLAN_QUOTA_OUT = 128 KiB
# BLUETOOTH
BLUETOOTH_QUOTA_IN = 128 KiB
-BLUETOOTH_QUOTA_OUT = 128 KiB
\ No newline at end of file
+BLUETOOTH_QUOTA_OUT = 128 KiB
+
+[transport-blacklist-M1RGJB4FQSM17JJ3M9BF7Q0I8MCO8C462NMOHI26RLT7C7A2KE6HCOPRA4ARM5HPL1J9IDDK5G8SFU5GUSHCTBH90ECETK1BFQD76R0]
+HIJN5O404QNUR37OSJUTNJ6H2KJS198DHI2J3I8SE3DMKVRG1RNQPODN1IJBF14KEMPPPRM0B9F9ILFKHOFCA655CH6M5OCNCMR0FE0
=
+CDTU8QQ8UPLGHR3B91V0CLTDOHONLB8QGHGUEM2JM1GANTEV0O6T20SD2N2HDN2QSHDG6IDTBR48KRDCS601FI6VHG59E7DQA98JD2O
=
+
+[transport-blacklist-93ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O]
+HIJN5O404QNUR37OSJUTNJ6H2KJS198DHI2J3I8SE3DMKVRG1RNQPODN1IJBF14KEMPPPRM0B9F9ILFKHOFCA655CH6M5OCNCMR0FE0
=
+CDTU8QQ8UPLGHR3B91V0CLTDOHONLB8QGHGUEM2JM1GANTEV0O6T20SD2N2HDN2QSHDG6IDTBR48KRDCS601FI6VHG59E7DQA98JD2O
=
+
+[transport-blacklist-OF84RAOAU2B1SOSEHJH6350MA0F7C98U55RI76LGIQOM7O33TFHPNUFB47CDBSCOLIINMVJ2U82445ABOBQRIVREG20L31KVDV5HG60]
+HIJN5O404QNUR37OSJUTNJ6H2KJS198DHI2J3I8SE3DMKVRG1RNQPODN1IJBF14KEMPPPRM0B9F9ILFKHOFCA655CH6M5OCNCMR0FE0
=
+CDTU8QQ8UPLGHR3B91V0CLTDOHONLB8QGHGUEM2JM1GANTEV0O6T20SD2N2HDN2QSHDG6IDTBR48KRDCS601FI6VHG59E7DQA98JD2O
=
+
+[transport-blacklist-548J7M14O4I0F8I84U0UFARVJ97DB6QOT3MCA8O8SNAIT5JJ8TR95LUVAP3N5L7DN33IB49SNMF3Q3C0VPLTGP9ASCULA9S2OIMHHH8]
+HIJN5O404QNUR37OSJUTNJ6H2KJS198DHI2J3I8SE3DMKVRG1RNQPODN1IJBF14KEMPPPRM0B9F9ILFKHOFCA655CH6M5OCNCMR0FE0
=
+CDTU8QQ8UPLGHR3B91V0CLTDOHONLB8QGHGUEM2JM1GANTEV0O6T20SD2N2HDN2QSHDG6IDTBR48KRDCS601FI6VHG59E7DQA98JD2O
=
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29364 - gnunet/src/ats-tests,
gnunet <=