[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16781 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16781 - gnunet/src/transport |
Date: |
Tue, 13 Sep 2011 10:15:04 +0200 |
Author: wachs
Date: 2011-09-13 10:15:04 +0200 (Tue, 13 Sep 2011)
New Revision: 16781
Modified:
gnunet/src/transport/test_transport_api.c
gnunet/src/transport/test_transport_api_reliability.c
gnunet/src/transport/test_transport_api_unreliability.c
Log:
no hard fail in case out transmit_ready timeout instead shut peers correctly
down
Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c 2011-09-13 07:48:31 UTC (rev
16780)
+++ gnunet/src/transport/test_transport_api.c 2011-09-13 08:15:04 UTC (rev
16781)
@@ -46,7 +46,7 @@
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
/**
* How long until we give up on transmitting the message?
@@ -164,6 +164,17 @@
th = NULL;
+ if (buf == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Timeout occurred while waiting for transmit_ready\n");
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ ok = 42;
+ return 0;
+ }
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting message with %u bytes to peer %s\n",
sizeof (struct GNUNET_MessageHeader), GNUNET_i2s (&p->id));
@@ -204,8 +215,9 @@
if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
- th = GNUNET_TRANSPORT_notify_transmit_ready (p1->th, &p2->id, 256, 0,
TIMEOUT,
- ¬ify_ready, &p1);
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p1->th, &p2->id, 256, 0,
+ TIMEOUT_TRANSMIT, ¬ify_ready,
+ &p1);
}
static void
Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c 2011-09-13
07:48:31 UTC (rev 16780)
+++ gnunet/src/transport/test_transport_api_reliability.c 2011-09-13
08:15:04 UTC (rev 16781)
@@ -45,10 +45,16 @@
#define START_ARM GNUNET_YES
/**
+ * Testcase timeout
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+
+/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 900)
+#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10)
+
static char *test_source;
static char *test_plugin;
@@ -251,13 +257,18 @@
unsigned int s;
unsigned int ret;
+ th = NULL;
if (buf == NULL)
{
- GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Timeout occurred while waiting for transmit_ready\n");
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
ok = 42;
return 0;
}
- th = NULL;
+
ret = 0;
s = get_size (n);
GNUNET_assert (size >= s);
@@ -290,8 +301,8 @@
{
if (th == NULL)
th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s, 0,
- TIMEOUT, ¬ify_ready,
- NULL);
+ TIMEOUT_TRANSMIT,
+ ¬ify_ready, NULL);
msg_scheduled = n;
}
if (n % 5000 == 0)
@@ -348,7 +359,8 @@
{
start_time = GNUNET_TIME_absolute_get ();
th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, get_size (0),
0,
- TIMEOUT, ¬ify_ready, NULL);
+ TIMEOUT_TRANSMIT, ¬ify_ready,
+ NULL);
}
static void
Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c 2011-09-13
07:48:31 UTC (rev 16780)
+++ gnunet/src/transport/test_transport_api_unreliability.c 2011-09-13
08:15:04 UTC (rev 16781)
@@ -46,9 +46,14 @@
#define START_ARM GNUNET_YES
/**
+ * Testcase timeout
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+
+/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 900)
+#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10)
static char *test_source;
@@ -315,7 +320,11 @@
if (buf == NULL)
{
- GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Timeout occurred while waiting for transmit_ready\n");
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
ok = 42;
return 0;
}
@@ -350,7 +359,8 @@
while (size - ret >= s);
if (n < TOTAL_MSGS)
{
- th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s, 0,
TIMEOUT,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s, 0,
+ TIMEOUT_TRANSMIT,
¬ify_ready, NULL);
msg_scheduled = n;
}
@@ -412,7 +422,8 @@
{
start_time = GNUNET_TIME_absolute_get ();
th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, get_size (0),
0,
- TIMEOUT, ¬ify_ready, NULL);
+ TIMEOUT_TRANSMIT, ¬ify_ready,
+ NULL);
}
static void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16781 - gnunet/src/transport,
gnunet <=