[GNUnet-SVN] r35397 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2015-03-17 10:12:22 +0100 (Tue, 17 Mar 2015)
New Revision: 35397

Modified:
   gnunet/src/transport/plugin_transport_udp.c
   gnunet/src/transport/test_transport_api_reliability.c
   gnunet/src/transport/transport.conf.in
Log:
consistently call deq before qc

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2015-03-17 08:54:59 UTC (rev 
35396)
+++ gnunet/src/transport/plugin_transport_udp.c 2015-03-17 09:12:22 UTC (rev 
35397)
@@ -2986,13 +2986,12 @@
     if (GNUNET_TIME_UNIT_ZERO.rel_value_us == remaining.rel_value_us)
     {
       /* Message timed out */
+      removed = GNUNET_YES;
+      dequeue (plugin,
+               udpw);
       udpw->qc (udpw->qc_cls,
                 udpw,
                 GNUNET_SYSERR);
-      /* Remove message */
-      removed = GNUNET_YES;
-      dequeue (plugin,
-               udpw);
       GNUNET_free (udpw);
 
       if (sock == plugin->sockv4)
@@ -3166,11 +3165,11 @@
     else
     {
       GNUNET_break (0);
+      dequeue (plugin,
+               udpw);
       udpw->qc (udpw->qc_cls,
                 udpw,
                 GNUNET_SYSERR);
-      dequeue (plugin,
-               udpw);
       notify_session_monitor (plugin,
                               udpw->session,
                               GNUNET_TRANSPORT_SS_UPDATE);
@@ -3182,6 +3181,8 @@
                                          udpw->msg_size,
                                          a,
                                          slen);
+    dequeue (plugin,
+             udpw);
     if (GNUNET_SYSERR == sent)
     {
       /* Failure */
@@ -3226,8 +3227,6 @@
                 udpw,
                 GNUNET_OK);
     }
-    dequeue (plugin,
-             udpw);
     notify_session_monitor (plugin,
                             udpw->session,
                             GNUNET_TRANSPORT_SS_UPDATE);

Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c       2015-03-17 
08:54:59 UTC (rev 35396)
+++ gnunet/src/transport/test_transport_api_reliability.c       2015-03-17 
09:12:22 UTC (rev 35397)
@@ -31,14 +31,20 @@
 #include "gauger.h"
 #include "transport-testing.h"
 
+
 /**
+ * Allow making the problem "bigger".
+ */
+#define FACTOR 10
+
+/**
  * Total number of messages to send
  *
  * Note that this value must not significantly exceed
  * 'MAX_PENDING' in 'gnunet-service-transport_clients.c', otherwise
  * messages may be dropped even for a reliable transport.
  */
-#define TOTAL_MSGS (1024 * 3)
+#define TOTAL_MSGS (1024 * 3 * FACTOR)
 
 /**
  * Message type of test messages
@@ -48,12 +54,12 @@
 /**
  * Testcase timeout
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90 * 
FACTOR)
 
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 60 * FACTOR)
 
 
 /**

Modified: gnunet/src/transport/transport.conf.in
===================================================================
--- gnunet/src/transport/transport.conf.in      2015-03-17 08:54:59 UTC (rev 
35396)
+++ gnunet/src/transport/transport.conf.in      2015-03-17 09:12:22 UTC (rev 
35397)
@@ -3,7 +3,7 @@
 @address@hidden = 2091
 HOSTNAME = localhost
 BINARY = gnunet-service-transport
-# PREFIX = valgrind
+PREFIX = valgrind
 NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;