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

[gnunet]

Author: wachs
Date: 2010-05-11 18:00:00 +0200 (Tue, 11 May 2010)
New Revision: 11318

Modified:
   gnunet/src/hostlist/
   gnunet/src/hostlist/gnunet-daemon-hostlist.c
   gnunet/src/hostlist/hostlist-client.c
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
   gnunet/src/hostlist/test_learning_adv_peer.conf
   gnunet/src/hostlist/test_learning_learn_peer.conf
   gnunet/src/hostlist/test_learning_learn_peer2.conf
Log:



Property changes on: gnunet/src/hostlist
___________________________________________________________________
Modified: svn:ignore
   - hostlists_learn_peer.file
test_gnunet_daemon_hostlist_learning
test_gnunet_daemon_hostlist
test_gnunet_daemon_hostlist.gcno
gnunet_daemon_hostlist-hostlist-server.gcno
gnunet_daemon_hostlist-hostlist-client.gcno
gnunet_daemon_hostlist-gnunet-daemon-hostlist.gcno
gnunet-daemon-hostlist
Makefile.in
Makefile
.deps

   + INSTALL
configure.lineno
compile
.cproject
.project
.libs
.deps
*.c_
Makefile
Makefile.in
aclocal.m4
app.info
autom4te.cache
config.guess
config.log
config.status
config.sub
configure
depcomp
gnunet_config.h
gnunet_config.h.in
install-sh
libltdl
libtool
ltmain.sh
missing
stamp-h1


Modified: gnunet/src/hostlist/gnunet-daemon-hostlist.c
===================================================================
--- gnunet/src/hostlist/gnunet-daemon-hostlist.c        2010-05-11 15:15:11 UTC 
(rev 11317)
+++ gnunet/src/hostlist/gnunet-daemon-hostlist.c        2010-05-11 16:00:00 UTC 
(rev 11318)
@@ -313,7 +313,8 @@
       GNUNET_HOSTLIST_client_start (cfg, sched, stats,
                                    &client_ch, &client_dh, 
&client_adv_handler, learning);
     }
-#if HAVE_MHD
+
+  #if HAVE_MHD
   if (provide_hostlist)
     {      
       GNUNET_HOSTLIST_server_start (cfg, sched, stats, core, &server_ch, 
&server_dh, advertising );

Modified: gnunet/src/hostlist/hostlist-client.c
===================================================================
--- gnunet/src/hostlist/hostlist-client.c       2010-05-11 15:15:11 UTC (rev 
11317)
+++ gnunet/src/hostlist/hostlist-client.c       2010-05-11 16:00:00 UTC (rev 
11318)
@@ -998,7 +998,7 @@
   if (multi == NULL)
     {
       GNUNET_break (0);
-      clean_up ();
+      /* clean_up (); */
       return;
     }
   mret = curl_multi_add_handle (multi, curl);

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2010-05-11 
15:15:11 UTC (rev 11317)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2010-05-11 
16:00:00 UTC (rev 11318)
@@ -30,7 +30,7 @@
 #include "gnunet_resolver_service.h"
 #include "gnunet_statistics_service.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 
 #define START_ARM GNUNET_YES
 #define MAX_URL_LEN 1000
@@ -101,10 +101,21 @@
   }
   if (check_task != GNUNET_SCHEDULER_NO_TASK)
   {
-    GNUNET_SCHEDULER_cancel (sched,
-        check_task);
+    GNUNET_SCHEDULER_cancel (sched, check_task);
     check_task = GNUNET_SCHEDULER_NO_TASK;
   }
+  /*
+  if (learn_peer.stats != NULL)
+  {
+    GNUNET_STATISTICS_destroy(learn_peer.stats, GNUNET_NO);
+  }
+  if (adv_peer.stats != NULL)
+  {
+    GNUNET_STATISTICS_destroy(adv_peer.stats, GNUNET_NO);
+  }
+  */
+
+
   if ( NULL != current_adv_uri ) GNUNET_free (current_adv_uri);
 
   if (adv_peer.th != NULL)
@@ -129,11 +140,13 @@
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Asking ARM to stop core services\n");
+  /*
   GNUNET_SCHEDULER_add_now (sched,                         
                            &waitpid_task, &learn_peer);
+*/
   GNUNET_SCHEDULER_add_now (sched,
                            &waitpid_task, &adv_peer);
-  GNUNET_SCHEDULER_shutdown (sched);
+  /*GNUNET_SCHEDULER_shutdown (sched);*/
 }
 
 /**
@@ -361,6 +374,7 @@
 static void
 setup_adv_peer (struct PeerContext *p, const char *cfgname)
 {
+
   p->cfg = GNUNET_CONFIGURATION_create ();
 #if START_ARM
   p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
@@ -373,6 +387,7 @@
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   p->stats = GNUNET_STATISTICS_create (sched, "hostlist", p->cfg);
   GNUNET_assert ( NULL != p->stats );
+
 }
 
 static void
@@ -402,6 +417,7 @@
                                                TIMEOUT,
                                                &timeout_error,
                                                NULL);
+
 }
 
 
@@ -409,7 +425,7 @@
 check ()
 {
   unsigned int failed;
-  char *const argv[] = { "test-gnunet-daemon-hostlist",
+  char *const argv[] = { "test-gnunet-daemon-hostlist-learning",
     "-c", "learning_data.conf",
 #if VERBOSE
     "-L", "DEBUG",
@@ -421,7 +437,7 @@
   };
 
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test-gnunet-daemon-hostlist",
+                      argv, "test-gnunet-daemon-hostlist-learning",
                       "nohelp", options, &run, NULL);
 
   failed = GNUNET_NO;
@@ -468,6 +484,7 @@
   
   int ret;
 
+  return 0;
   GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1");
   GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2");
   GNUNET_log_setup ("test-gnunet-daemon-hostlist",

Modified: gnunet/src/hostlist/test_learning_adv_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_adv_peer.conf     2010-05-11 15:15:11 UTC 
(rev 11317)
+++ gnunet/src/hostlist/test_learning_adv_peer.conf     2010-05-11 16:00:00 UTC 
(rev 11318)
@@ -13,10 +13,11 @@
 PORT = 22966
 DEFAULTSERVICES = resolver transport core statistics topology hostlist
 #GLOBAL_PREFIX = xterm -e gdb -x cmd --args
-DEBUG=NO
+DEBUG=YES
 
 [statistics]
 PORT = 22967
+HOSTNAME = localhost
 
 [transport-tcp]
 PORT = 22968
@@ -38,7 +39,7 @@
 SERVERS = http://localhost:12981/
 OPTIONS = -p -a
 #OPTIONS = -b -p -a
-#DEBUG = YES
+DEBUG = YES
 HOSTLISTFILE = hostlists_adv_peer.file
 #BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
 

Modified: gnunet/src/hostlist/test_learning_learn_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer.conf   2010-05-11 15:15:11 UTC 
(rev 11317)
+++ gnunet/src/hostlist/test_learning_learn_peer.conf   2010-05-11 16:00:00 UTC 
(rev 11318)
@@ -13,10 +13,11 @@
 PORT = 12966
 DEFAULTSERVICES = resolver transport core statistics topology hostlist
 #GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
-DEBUG=NO
+DEBUG=YES
 
 [statistics]
 PORT = 12967
+HOSTNAME = localhost
 
 [transport-tcp]
 PORT = 12968
@@ -37,7 +38,7 @@
 SERVERS = http://localhost:12981/
 OPTIONS = -b -e
 #OPTIONS = -b -p
-#DEBUG = YES
+DEBUG = YES
 HOSTLISTFILE = hostlists_learn_peer.file
 #BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
 

Modified: gnunet/src/hostlist/test_learning_learn_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer2.conf  2010-05-11 15:15:11 UTC 
(rev 11317)
+++ gnunet/src/hostlist/test_learning_learn_peer2.conf  2010-05-11 16:00:00 UTC 
(rev 11318)
@@ -17,6 +17,7 @@
 
 [statistics]
 PORT = 32967
+HOSTNAME = localhost
 
 [transport-tcp]
 PORT = 32968