[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17569 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17569 - gnunet/src/transport |
Date: |
Tue, 18 Oct 2011 10:15:28 +0200 |
Author: wachs
Date: 2011-10-18 10:15:28 +0200 (Tue, 18 Oct 2011)
New Revision: 17569
Modified:
gnunet/src/transport/test_transport_api_unreliability.c
Log:
fix fail reason
Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c 2011-10-18
07:53:14 UTC (rev 17568)
+++ gnunet/src/transport/test_transport_api_unreliability.c 2011-10-18
08:15:28 UTC (rev 17569)
@@ -107,7 +107,8 @@
static int msg_recv;
static int test_connected;
-static int test_failed;
+static int test_sending;
+static int test_send_timeout;
static unsigned long long total_bytes;
@@ -183,18 +184,21 @@
die_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
- if (test_connected == GNUNET_NO)
+ if (test_connected == GNUNET_YES)
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");
+ if (test_sending == GNUNET_NO)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase did not send any messages
timeout\n");
else
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Reliability failed: Last message sent %u, Next message
scheduled %u, Last message received %u, Message expected %u\n",
msg_sent, msg_scheduled, msg_recv, msg_recv_expected);
+ if (test_send_timeout == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test had timeout while waiting to
send data\n");
+
if (th != NULL)
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
@@ -293,7 +297,7 @@
ntohl (hdr->num), s, ntohs (message->size), ntohl (hdr->num));
if (GNUNET_SCHEDULER_NO_TASK != die_task)
GNUNET_SCHEDULER_cancel (die_task);
- test_failed = GNUNET_YES;
+ test_sending = GNUNET_YES;
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
}
@@ -306,7 +310,7 @@
ntohl (hdr->num), (unsigned char) n);
if (GNUNET_SCHEDULER_NO_TASK != die_task)
GNUNET_SCHEDULER_cancel (die_task);
- test_failed = GNUNET_YES;
+ test_sending = GNUNET_YES;
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
}
@@ -324,7 +328,7 @@
fprintf (stderr, ".");
if (GNUNET_SCHEDULER_NO_TASK != die_task)
GNUNET_SCHEDULER_cancel (die_task);
- test_failed = GNUNET_YES;
+ test_sending = GNUNET_YES;
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
}
if (n == TOTAL_MSGS)
@@ -347,6 +351,7 @@
if (buf == NULL)
{
+ test_send_timeout = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout occurred while waiting for transmit_ready for msg %u
of %u\n",
msg_scheduled, TOTAL_MSGS);
@@ -478,7 +483,9 @@
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+ test_send_timeout = GNUNET_NO;
+
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1,
¬ify_receive,
¬ify_connect,
¬ify_disconnect,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17569 - gnunet/src/transport,
gnunet <=