[GNUnet-SVN] r9324 - in gnunet/src: . testing util

[gnunet]

Author: grothoff
Date: 2009-10-27 16:54:11 -0600 (Tue, 27 Oct 2009)
New Revision: 9324

Modified:
   gnunet/src/Makefile.am
   gnunet/src/testing/test_testing.c
   gnunet/src/testing/testing.c
   gnunet/src/util/connection.c
Log:
testing not yet ready for testing

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2009-10-27 22:27:40 UTC (rev 9323)
+++ gnunet/src/Makefile.am      2009-10-27 22:54:11 UTC (rev 9324)
@@ -20,7 +20,6 @@
   template \
   transport \
   core \
-  testing \
   $(HOSTLIST_DIR) \
   topology \
   fs \

Modified: gnunet/src/testing/test_testing.c
===================================================================
--- gnunet/src/testing/test_testing.c   2009-10-27 22:27:40 UTC (rev 9323)
+++ gnunet/src/testing/test_testing.c   2009-10-27 22:54:11 UTC (rev 9324)
@@ -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 @@
     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;
 }

Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c        2009-10-27 22:27:40 UTC (rev 9323)
+++ gnunet/src/testing/testing.c        2009-10-27 22:54:11 UTC (rev 9324)
@@ -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

Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c        2009-10-27 22:27:40 UTC (rev 9323)
+++ gnunet/src/util/connection.c        2009-10-27 22:54:11 UTC (rev 9324)
@@ -527,6 +527,11 @@
     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 @@
     {
 #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_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;