[GNUnet-SVN] r10603 - in gnunet: . src/core src/fs src/peerinfo src/statistics src/topology src/transport

[gnunet]

Author: grothoff
Date: 2010-03-15 15:22:47 +0100 (Mon, 15 Mar 2010)
New Revision: 10603

Modified:
   gnunet/TODO
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/fs/gnunet-service-fs.c
   gnunet/src/peerinfo/gnunet-service-peerinfo.c
   gnunet/src/statistics/statistics_api.c
   gnunet/src/topology/gnunet-daemon-topology.c
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/transport.h
Log:
fixing shutdown timeout issue

Modified: gnunet/TODO
===================================================================
--- gnunet/TODO 2010-03-15 14:16:02 UTC (rev 10602)
+++ gnunet/TODO 2010-03-15 14:22:47 UTC (rev 10603)
@@ -17,8 +17,12 @@
 * HOSTLIST/PEERINFO/CORE/TRANSPORT/TOPOLOGY:
   - hostlist server learns about 2nd peer, but soon forgets!
   - peers do not seem to connect (at least not for long!)
+  
 * TOPOLOGY:
   - needs more testing (especially F2F topology)
+  - calls 'GNUNET_CORE_peer_request_connect' with 'my_identity' as the PID,
+    despite having specific checks to prevent exactly that (!?)
+    => assertion failure in gnunet-service-core:2255 (hostlist test)
 * CORE:
   - needs more testing
 * UTIL:

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2010-03-15 14:16:02 UTC (rev 
10602)
+++ gnunet/src/core/gnunet-service-core.c       2010-03-15 14:22:47 UTC (rev 
10603)
@@ -3580,7 +3580,7 @@
   if (my_private_key != NULL)
     GNUNET_CRYPTO_rsa_key_free (my_private_key);
   if (stats != NULL)
-    GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
 }
 
 

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-03-15 14:16:02 UTC (rev 10602)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-03-15 14:22:47 UTC (rev 10603)
@@ -957,7 +957,7 @@
   core = NULL;
   if (stats != NULL)
     {
-      GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+      GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
       stats = NULL;
     }
   sched = NULL;

Modified: gnunet/src/peerinfo/gnunet-service-peerinfo.c
===================================================================
--- gnunet/src/peerinfo/gnunet-service-peerinfo.c       2010-03-15 14:16:02 UTC 
(rev 10602)
+++ gnunet/src/peerinfo/gnunet-service-peerinfo.c       2010-03-15 14:22:47 UTC 
(rev 10603)
@@ -775,7 +775,7 @@
   notify_list = NULL;
   if (stats != NULL)
     {
-      GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+      GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
       stats = NULL;
     }
 }

Modified: gnunet/src/statistics/statistics_api.c
===================================================================
--- gnunet/src/statistics/statistics_api.c      2010-03-15 14:16:02 UTC (rev 
10602)
+++ gnunet/src/statistics/statistics_api.c      2010-03-15 14:22:47 UTC (rev 
10603)
@@ -32,7 +32,12 @@
 #include "gnunet_strings_lib.h"
 #include "statistics.h"
 
-#define SET_TRANSMIT_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 30)
+/**
+ * How long do we wait until a statistics request for setting
+ * a value times out?  (The update will be lost if the
+ * service does not react within this timeframe).  
+ */
+#define SET_TRANSMIT_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS, 250)
 
 
 /**

Modified: gnunet/src/topology/gnunet-daemon-topology.c
===================================================================
--- gnunet/src/topology/gnunet-daemon-topology.c        2010-03-15 14:16:02 UTC 
(rev 10602)
+++ gnunet/src/topology/gnunet-daemon-topology.c        2010-03-15 14:22:47 UTC 
(rev 10603)
@@ -1331,7 +1331,7 @@
     }
   if (stats != NULL)
     {
-      GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+      GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
       stats = NULL;
     }
 }

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2010-03-15 14:16:02 UTC 
(rev 10602)
+++ gnunet/src/transport/gnunet-service-transport.c     2010-03-15 14:22:47 UTC 
(rev 10603)
@@ -3373,7 +3373,7 @@
   validation_map = NULL;
   if (stats != NULL)
     {
-      GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+      GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
       stats = NULL;
     }
 }

Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h    2010-03-15 14:16:02 UTC (rev 10602)
+++ gnunet/src/transport/transport.h    2010-03-15 14:22:47 UTC (rev 10603)
@@ -30,9 +30,9 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_transport_service.h"
 
-#define DEBUG_TRANSPORT GNUNET_NO
-#define DEBUG_TRANSPORT_TIMEOUT GNUNET_NO
-#define DEBUG_TRANSPORT_DISCONNECT GNUNET_NO
+#define DEBUG_TRANSPORT GNUNET_YES
+#define DEBUG_TRANSPORT_TIMEOUT GNUNET_YES
+#define DEBUG_TRANSPORT_DISCONNECT GNUNET_YES
 
 /**
  * For how long do we allow unused bandwidth