From 4c3512dc834a6be9da4a8a656f596da536ca67f4 Mon Sep 17 00:00:00 2001
From: Matthias Wachs <wachs@net.in.tum.de>
Date: Fri, 30 Sep 2011 11:20:44 +0000
Subject: [PATCH] some diagnoses

---
 src/transport/test_transport_api_disconnect.c    |  3 +--
 src/transport/test_transport_api_reliability.c   |  9 ++++++++-
 src/transport/test_transport_api_unreliability.c | 12 +++++++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c
index 267c56af6..3cc30d91d 100644
--- a/src/transport/test_transport_api_disconnect.c
+++ b/src/transport/test_transport_api_disconnect.c
@@ -64,6 +64,7 @@ static struct PeerContext p2;
 static int ok;
 
 static int peers_connected = 0;
+
 static int counter;
 static int msgs_recv;
 
@@ -313,8 +314,6 @@ peers_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   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);
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 1b6d89afe..7f8c9ad0f 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -100,6 +100,7 @@ static int msg_recv_expected;
 static int msg_recv;
 
 static int test_failed;
+static int test_connected;
 
 static unsigned long long total_bytes;
 
@@ -150,6 +151,11 @@ end_badly ()
   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 @@ notify_ready (void *cls, size_t size, void *buf)
   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 @@ run (void *cls, char *const *args, const char *cfgfile,
     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);
 }
diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c
index 7b7ec2d35..30862424c 100644
--- a/src/transport/test_transport_api_unreliability.c
+++ b/src/transport/test_transport_api_unreliability.c
@@ -104,6 +104,7 @@ static int msg_sent;
 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 @@ end_badly ()
   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 @@ notify_ready (void *cls, size_t size, void *buf)
   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 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
               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 @@ run (void *cls, char *const *args, const char *cfgfile,
     return;
   }
 
+  test_connected = GNUNET_NO;
   GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, NULL);
 }
 
-- 
2.25.1