[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17136 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17136 - gnunet/src/transport |
Date: |
Fri, 30 Sep 2011 13:20:44 +0200 |
Author: wachs
Date: 2011-09-30 13:20:44 +0200 (Fri, 30 Sep 2011)
New Revision: 17136
Modified:
gnunet/src/transport/test_transport_api_disconnect.c
gnunet/src/transport/test_transport_api_reliability.c
gnunet/src/transport/test_transport_api_unreliability.c
Log:
some diagnoses
Modified: gnunet/src/transport/test_transport_api_disconnect.c
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect.c 2011-09-30
11:00:24 UTC (rev 17135)
+++ gnunet/src/transport/test_transport_api_disconnect.c 2011-09-30
11:20:44 UTC (rev 17136)
@@ -64,6 +64,7 @@
static int ok;
static int peers_connected = 0;
+
static int counter;
static int msgs_recv;
@@ -313,8 +314,6 @@
if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
- //while (peers_connected > 0);
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from Transport \n");
GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c 2011-09-30
11:00:24 UTC (rev 17135)
+++ gnunet/src/transport/test_transport_api_reliability.c 2011-09-30
11:20:44 UTC (rev 17136)
@@ -100,6 +100,7 @@
static int msg_recv;
static int test_failed;
+static int test_connected;
static unsigned long long total_bytes;
@@ -150,6 +151,11 @@
die_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
+ if (test_connected == GNUNET_NO)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got connected\n");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got NOT connected\n");
+
if (th != NULL)
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
@@ -261,7 +267,7 @@
if (buf == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Timeout occurred while waiting for transmit_ready\n");
+ "Timeout occurred while waiting for transmit_ready for message
%u of %u\n", msg_scheduled, TOTAL_MSGS);
if (GNUNET_SCHEDULER_NO_TASK != die_task)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
@@ -401,6 +407,7 @@
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
}
+ test_connected = GNUNET_NO;
GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, NULL);
}
Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c 2011-09-30
11:00:24 UTC (rev 17135)
+++ gnunet/src/transport/test_transport_api_unreliability.c 2011-09-30
11:20:44 UTC (rev 17136)
@@ -104,6 +104,7 @@
static int msg_recv_expected;
static int msg_recv;
+static int test_connected;
static int test_failed;
static unsigned long long total_bytes;
@@ -172,6 +173,11 @@
die_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
+ if (test_connected == GNUNET_NO)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got connected\n");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got NOT connected\n");
+
if (test_failed == GNUNET_NO)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase timeout\n");
else
@@ -324,7 +330,8 @@
if (buf == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Timeout occurred while waiting for transmit_ready\n");
+ "Timeout occurred while waiting for transmit_ready for msg %u
of %u\n",
+ msg_scheduled, TOTAL_MSGS);
if (GNUNET_SCHEDULER_NO_TASK != die_task)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
@@ -439,6 +446,8 @@
GNUNET_i2s (&p2->id));
GNUNET_free (p1_c);
+ test_connected = GNUNET_YES;
+
// FIXME: THIS IS REQUIRED! SEEMS TO BE A BUG!
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &sendtask, NULL);
}
@@ -465,6 +474,7 @@
return;
}
+ test_connected = GNUNET_NO;
GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, NULL);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17136 - gnunet/src/transport,
gnunet <=