[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17305 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17305 - gnunet/src/transport |
Date: |
Mon, 10 Oct 2011 12:50:08 +0200 |
Author: wachs
Date: 2011-10-10 12:50:08 +0200 (Mon, 10 Oct 2011)
New Revision: 17305
Modified:
gnunet/src/transport/test_transport_api_reliability.c
gnunet/src/transport/test_transport_api_unreliability.c
gnunet/src/transport/test_transport_api_unreliability_constant.c
Log:
fixes
Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c 2011-10-10
10:39:43 UTC (rev 17304)
+++ gnunet/src/transport/test_transport_api_reliability.c 2011-10-10
10:50:08 UTC (rev 17305)
@@ -81,6 +81,9 @@
struct GNUNET_TRANSPORT_TESTING_handle * tth;
+static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
+
+
/*
* Testcase specific declarations
*/
@@ -147,8 +150,13 @@
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
+ if (cc != NULL)
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+
+ GNUNET_TRANSPORT_TESTING_done (tth);
}
static void
@@ -166,6 +174,9 @@
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
+ if (cc != NULL)
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+
if (p1 != NULL)
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
if (p2 != NULL)
@@ -402,7 +413,10 @@
p2->no, GNUNET_i2s (&p2->id));
GNUNET_free (p1_c);
+ cc = NULL;
+
GNUNET_SCHEDULER_add_now (&sendtask, NULL);
+
}
void start_cb (struct PeerContext * p,
@@ -435,7 +449,7 @@
sender->no, sender_c,
receiver->no, GNUNET_i2s (&receiver->id));
- GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb,
NULL);
+ cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2,
&testing_connect_cb, NULL);
}
Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c 2011-10-10
10:39:43 UTC (rev 17304)
+++ gnunet/src/transport/test_transport_api_unreliability.c 2011-10-10
10:50:08 UTC (rev 17305)
@@ -39,7 +39,7 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
@@ -78,7 +78,7 @@
uint32_t max_bps_p1;
uint32_t max_bps_p2;
-struct TransportTestingHandle * tth;
+struct GNUNET_TRANSPORT_TESTING_handle * tth;
/*
* Testcase specific declarations
@@ -115,6 +115,8 @@
static char bitmap[TOTAL_MSGS / 8];
+static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
+
/*
* END Testcase specific declarations
*/
@@ -152,6 +154,10 @@
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
+ if (cc != NULL)
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+ cc = NULL;
+
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
@@ -193,6 +199,10 @@
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
+ if (cc != NULL)
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+ cc = NULL;
+
if (p1 != NULL)
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
if (p2 != NULL)
@@ -319,7 +329,6 @@
}
if (n == TOTAL_MSGS)
{
- fprintf (stderr, "\n");
end ();
}
}
@@ -387,7 +396,7 @@
{
fprintf (stderr, "\n");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "All messages scheduled to be sent!!\n");
+ "All messages scheduled to be sent\n");
if (GNUNET_SCHEDULER_NO_TASK != die_task)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
@@ -451,15 +460,14 @@
testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
{
char *p1_c = strdup (GNUNET_i2s (&p1->id));
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %s <-> %s\n", p1_c,
GNUNET_i2s (&p2->id));
GNUNET_free (p1_c);
test_connected = GNUNET_YES;
+ cc = NULL;
- // FIXME: THIS IS REQUIRED! SEEMS TO BE A BUG!
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &sendtask, NULL);
+ GNUNET_SCHEDULER_add_now (&sendtask, NULL);
}
void start_cb (struct PeerContext * p,
@@ -476,10 +484,8 @@
return;
test_connected = GNUNET_NO;
+ cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2,
&testing_connect_cb, NULL);
- test_connected = GNUNET_NO;
- GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb,
NULL);
-
}
static void
Modified: gnunet/src/transport/test_transport_api_unreliability_constant.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_constant.c
2011-10-10 10:39:43 UTC (rev 17304)
+++ gnunet/src/transport/test_transport_api_unreliability_constant.c
2011-10-10 10:50:08 UTC (rev 17305)
@@ -80,6 +80,8 @@
uint32_t max_bps_p1;
uint32_t max_bps_p2;
+static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
+
/*
* Testcase specific declarations
*/
@@ -151,6 +153,10 @@
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
+ if (cc != NULL)
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+ cc = NULL;
+
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
@@ -179,6 +185,10 @@
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
+ if (cc != NULL)
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+ cc = NULL;
+
if (p1 != NULL)
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
if (p2 != NULL)
@@ -415,6 +425,8 @@
GNUNET_i2s (&p2->id));
GNUNET_free (p1_c);
+ cc = NULL;
+
GNUNET_SCHEDULER_add_now (&sendtask, NULL);
}
@@ -431,8 +443,7 @@
if (started != 2)
return;
- GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb,
NULL);
-
+ cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2,
&testing_connect_cb, NULL);
}
static void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17305 - gnunet/src/transport,
gnunet <=