[GNUnet-SVN] r10365 - gnunet/src/hostlist

[gnunet]

Author: grothoff
Date: 2010-02-18 14:12:46 +0100 (Thu, 18 Feb 2010)
New Revision: 10365

Modified:
   gnunet/src/hostlist/Makefile.am
   gnunet/src/hostlist/hostlist-client.c
   gnunet/src/hostlist/hostlist-server.c
   gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
Log:
nicer logging, activating testcase

Modified: gnunet/src/hostlist/Makefile.am
===================================================================
--- gnunet/src/hostlist/Makefile.am     2010-02-18 12:53:04 UTC (rev 10364)
+++ gnunet/src/hostlist/Makefile.am     2010-02-18 13:12:46 UTC (rev 10365)
@@ -30,7 +30,7 @@
 check_PROGRAMS = \
  test_gnunet_daemon_hostlist
 
-# TESTS = $(check_PROGRAMS)
+TESTS = $(check_PROGRAMS)
 
 test_gnunet_daemon_hostlist_SOURCES = \
  test_gnunet_daemon_hostlist.c

Modified: gnunet/src/hostlist/hostlist-client.c
===================================================================
--- gnunet/src/hostlist/hostlist-client.c       2010-02-18 12:53:04 UTC (rev 
10364)
+++ gnunet/src/hostlist/hostlist-client.c       2010-02-18 13:12:46 UTC (rev 
10365)
@@ -624,7 +624,9 @@
                         hostlist_delay.value,
                         GNUNET_YES);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-             _("Will consider downloading hostlist in %llums\n"),
+             _("Have %u/%u connections.  Will consider downloading hostlist in 
%llums\n"),
+             connection_count,
+             MIN_CONNECTIONS,
              (unsigned long long) delay.value);
   current_task = GNUNET_SCHEDULER_add_delayed (sched,
                                               delay,

Modified: gnunet/src/hostlist/hostlist-server.c
===================================================================
--- gnunet/src/hostlist/hostlist-server.c       2010-02-18 12:53:04 UTC (rev 
10364)
+++ gnunet/src/hostlist/hostlist-server.c       2010-02-18 13:12:46 UTC (rev 
10365)
@@ -238,8 +238,6 @@
                  method);
       return MHD_NO;
     }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-             _("Received request for our hostlist\n"));
   if (NULL == *con_cls)
     {
       (*con_cls) = &dummy;
@@ -263,6 +261,8 @@
                  _("Could not handle hostlist request since I do not have a 
response yet\n"));
       return MHD_NO;              /* internal error, no response yet */
     }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+             _("Received request for our hostlist\n"));
   return MHD_queue_response (connection, MHD_HTTP_OK, response);
 }
 

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist.c   2010-02-18 12:53:04 UTC 
(rev 10364)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist.c   2010-02-18 13:12:46 UTC 
(rev 10365)
@@ -27,7 +27,7 @@
 #include "gnunet_arm_service.h"
 #include "gnunet_transport_service.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define START_ARM GNUNET_YES
 
@@ -114,9 +114,8 @@
                               timeout_task);
       timeout_task = GNUNET_SCHEDULER_NO_TASK;
     }
-  GNUNET_SCHEDULER_add_delayed (sched,
-                               GNUNET_TIME_UNIT_MINUTES,
-                               &clean_up, NULL);
+  GNUNET_SCHEDULER_add_now (sched,
+                           &clean_up, NULL);
 }
 
 

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf  2010-02-18 
12:53:04 UTC (rev 10364)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf  2010-02-18 
13:12:46 UTC (rev 10365)
@@ -8,7 +8,7 @@
 [transport]
 PORT = 12965
 PLUGINS = tcp
-DEBUG = YES
+#DEBUG = YES
 
 [arm]
 PORT = 12966
@@ -26,8 +26,8 @@
 
 [core]
 PORT = 12970
-DEBUG = YES
-PREFIX = valgrind --tool=memcheck
+#DEBUG = YES
+#PREFIX = valgrind --tool=memcheck
 
 [testing]
 WEAKRANDOM = YES
@@ -36,9 +36,9 @@
 HTTPPORT = 12980
 SERVERS = http://localhost:12981/
 OPTIONS = -b -p
-DEBUG = YES
+#DEBUG = YES
 #BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
 
 [topology]
-DEBUG = YES
-PREFIX = valgrind --tool=memcheck
+#DEBUG = YES
+#PREFIX = valgrind --tool=memcheck

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf  2010-02-18 
12:53:04 UTC (rev 10364)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf  2010-02-18 
13:12:46 UTC (rev 10365)
@@ -8,7 +8,7 @@
 [transport]
 PORT = 22965
 PLUGINS = tcp
-DEBUG = YES
+#DEBUG = YES
 
 [arm]
 PORT = 22966
@@ -26,8 +26,8 @@
 
 [core]
 PORT = 22970
-DEBUG = YES
-PREFIX = valgrind --tool=memcheck
+#DEBUG = YES
+#PREFIX = valgrind --tool=memcheck
 
 [testing]
 WEAKRANDOM = YES
@@ -36,9 +36,9 @@
 HTTPPORT = 12981
 SERVERS = http://localhost:12980/
 OPTIONS = -b -p
-DEBUG = YES
+#DEBUG = YES
 #BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
 
 [topology]
-DEBUG = YES
-PREFIX = valgrind --tool=memcheck
+#DEBUG = YES
+#PREFIX = valgrind --tool=memcheck