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

[gnunet]

Author: wachs
Date: 2010-04-20 15:47:58 +0200 (Tue, 20 Apr 2010)
New Revision: 10995

Modified:
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
Log:


Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2010-04-20 
13:10:56 UTC (rev 10994)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2010-04-20 
13:47:58 UTC (rev 10995)
@@ -29,15 +29,16 @@
 #include "gnunet_transport_service.h"
 #include "gnunet_resolver_service.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 
 #define START_ARM GNUNET_YES
 #define MAX_URL_LEN 1000
 
 /**
- * How long until we give up on transmitting the message?
+ * How long until wait until testcases fails
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
+#define CHECK_INTERVALL GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 2)
 
 static int timeout;
 static int adv_arrived;
@@ -45,6 +46,7 @@
 static struct GNUNET_SCHEDULER_Handle *sched;
 
 static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+static GNUNET_SCHEDULER_TaskIdentifier check_task;
     
 struct PeerContext
 {
@@ -96,6 +98,12 @@
                              timeout_task);
     timeout_task = GNUNET_SCHEDULER_NO_TASK;
   }
+  if (check_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (sched,
+        check_task);
+    check_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   GNUNET_SCHEDULER_add_now (sched,
                             &clean_up, NULL);
 }
@@ -114,6 +122,20 @@
 }
 
 /**
+ * Check the server statistics regularly
+ */
+static void
+check_statistics (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Checking server stats...\n");
+  check_task = GNUNET_SCHEDULER_add_delayed (sched,
+                                CHECK_INTERVALL,
+                                &check_statistics,
+                                NULL);
+}
+
+/**
  * Core handler for p2p hostlist advertisements
  */
 static int ad_arrive_handler (void *cls,
@@ -301,6 +323,10 @@
                                                TIMEOUT,
                                                &timeout_error,
                                                NULL);
+  check_task = GNUNET_SCHEDULER_add_delayed (sched,
+                                CHECK_INTERVALL,
+                                &check_statistics,
+                                NULL);
   GNUNET_SCHEDULER_add_delayed (sched,
                                 GNUNET_TIME_UNIT_FOREVER_REL,
                                 &shutdown_task,