summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2009-10-27 22:54:11 +0000
committerChristian Grothoff <christian@grothoff.org>2009-10-27 22:54:11 +0000
commit831a40aa47b5ca69a1ea35791e37fe3acb713436 (patch)
tree39f7b128d396b9d55b6256a309ab234277498648
parent673f6484f4dff8fac2cf3029dbd993581b61f370 (diff)
testing not yet ready for testing
-rw-r--r--src/Makefile.am1
-rw-r--r--src/testing/test_testing.c4
-rw-r--r--src/testing/testing.c4
-rw-r--r--src/util/connection.c13
4 files changed, 16 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index c30045c9b..50d75916b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,6 @@ SUBDIRS = \
template \
transport \
core \
- testing \
$(HOSTLIST_DIR) \
topology \
fs \
diff --git a/src/testing/test_testing.c b/src/testing/test_testing.c
index ab3bc10be..886427402 100644
--- a/src/testing/test_testing.c
+++ b/src/testing/test_testing.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_testing_lib.h"
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
static int ok;
@@ -91,7 +91,7 @@ check ()
GNUNET_GETOPT_OPTION_END
};
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, "test-tesing", "nohelp",
+ argv, "test-testing", "nohelp",
options, &run, &ok);
return ok;
}
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 6ecb9c944..e4cc74827 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -40,13 +40,13 @@
#include "gnunet_testing_lib.h"
#include "gnunet_transport_service.h"
-#define DEBUG_TESTING GNUNET_NO
+#define DEBUG_TESTING GNUNET_YES
/**
* How long do we wait after starting gnunet-service-arm
* for the core service to be alive?
*/
-#define ARM_START_WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
+#define ARM_START_WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
/**
* How many times are we willing to try to wait for "scp" or
diff --git a/src/util/connection.c b/src/util/connection.c
index 6f2b5a349..3cf2ae475 100644
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -527,6 +527,11 @@ destroy_continuation (void *cls,
GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock->sock));
GNUNET_free_non_null (sock->addr);
GNUNET_free_non_null (sock->hostname);
+#if DEBUG_CONNECTION
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Freeing memory of connection %p.\n",
+ sock);
+#endif
GNUNET_free (sock);
}
@@ -774,7 +779,8 @@ try_connect_using_address (void *cls,
{
#if DEBUG_CONNECTION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connection has already been destroyed.\n");
+ "Connection %p has already been destroyed.\n",
+ h);
#endif
return; /* already destroyed */
}
@@ -1565,6 +1571,11 @@ GNUNET_CONNECTION_notify_transmit_ready_cancel (struct
GNUNET_assert (h->notify_ready != NULL);
if (0 != (h->sh->ccs & COCO_TRANSMIT_READY))
{
+#if DEBUG_CONNECTION
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "notify_transmit_ready_cancel cancels timeout_task (%p)\n",
+ h);
+#endif
GNUNET_SCHEDULER_cancel (h->sh->sched, h->timeout_task);
h->timeout_task = GNUNET_SCHEDULER_NO_TASK;
h->sh->ccs -= COCO_TRANSMIT_READY;