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

[gnunet]

Author: grothoff
Date: 2010-02-27 13:09:56 +0100 (Sat, 27 Feb 2010)
New Revision: 10457

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/transport/transport.h
   gnunet/src/transport/transport_api.c
Log:
more logging

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2010-02-27 12:09:30 UTC 
(rev 10456)
+++ gnunet/src/transport/gnunet-service-transport.c     2010-02-27 12:09:56 UTC 
(rev 10457)
@@ -2831,7 +2831,8 @@
     (const struct QuotaSetMessage *) message;
   struct NeighbourList *n;
   struct TransportPlugin *p;
-  struct ReadyList *rl;
+  struct ReadyList *rl;          
+  uint32_t qin;
 
   n = find_neighbour (&qsm->peer);
   if (n == NULL)
@@ -2839,23 +2840,22 @@
       GNUNET_SERVER_receive_done (client, GNUNET_OK);
       return;
     }
-
+  qin = ntohl (qsm->quota_in);
 #if DEBUG_TRANSPORT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received `%s' request (new quota %u, old quota %u) from client 
for peer `%4s'\n",
-              "SET_QUOTA", ntohl(qsm->quota_in), n->quota_in, GNUNET_i2s 
(&qsm->peer));
+              "SET_QUOTA", qin, n->quota_in, GNUNET_i2s (&qsm->peer));
 #endif
-
   update_quota (n);
-  if (n->quota_in < ntohl (qsm->quota_in))
+  if (n->quota_in < qin)
     n->last_quota_update = GNUNET_TIME_absolute_get ();
-  n->quota_in = ntohl (qsm->quota_in);
+  n->quota_in = qin;
   rl = n->plugins;
   while (rl != NULL)
     {
       p = rl->plugin;
       p->api->set_receive_quota (p->api->cls,
-                                 &qsm->peer, ntohl (qsm->quota_in));
+                                 &qsm->peer, qin);
       rl = rl->next;
     }
   GNUNET_SERVER_receive_done (client, GNUNET_OK);

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2010-02-27 12:09:30 UTC (rev 
10456)
+++ gnunet/src/transport/plugin_transport_tcp.c 2010-02-27 12:09:56 UTC (rev 
10457)
@@ -322,6 +322,10 @@
   struct PendingMessage *pm;
   struct WelcomeMessage welcome;
 
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                  "tcp",
+                  "Creating new session for peer `%4s'\n",
+                  GNUNET_i2s (target));
   ret = GNUNET_malloc (sizeof (struct Session));
   ret->plugin = plugin;
   ret->next = plugin->sessions;
@@ -900,9 +904,21 @@
 
   session = find_session_by_target (plugin, target);
   if (session == NULL)
-    return;                     /* peer must have disconnected, ignore */
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                      "tcp",
+                      "Could not find session for peer `%4s' to update 
quota.\n",
+                      GNUNET_i2s (target));
+      return;                     /* peer must have disconnected, ignore */
+    }
   if (session->quota_in != quota_in)
     {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                      "tcp",
+                      "Changing quota for peer `%4s' from %u to %u\n",
+                      GNUNET_i2s (target),
+                      session->quota_in,
+                      quota_in);
       update_quota (session, GNUNET_YES);
       if (session->quota_in > quota_in)
         session->last_quota_update = GNUNET_TIME_absolute_get ();
@@ -1076,6 +1092,12 @@
     return GNUNET_TIME_UNIT_ZERO;       /* can receive right now */
   excess = session->last_received - avail;
   ret.value = excess / session->quota_in;
+  GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
+                  "tcp",
+                  "Throttling read (%llu bytes excess at %llu b/ms), waiting 
%llums before reading more.\n",
+                  (unsigned long long) excess,
+                  (unsigned long long) session->quota_in,
+                  (unsigned long long) ret.value);
   return ret;
 }
 

Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h    2010-02-27 12:09:30 UTC (rev 10456)
+++ gnunet/src/transport/transport.h    2010-02-27 12:09:56 UTC (rev 10457)
@@ -30,7 +30,7 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_transport_service.h"
 
-#define DEBUG_TRANSPORT GNUNET_NO
+#define DEBUG_TRANSPORT GNUNET_YES
 
 /**
  * For how long do we allow unused bandwidth

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2010-02-27 12:09:30 UTC (rev 
10456)
+++ gnunet/src/transport/transport_api.c        2010-02-27 12:09:56 UTC (rev 
10457)
@@ -535,7 +535,8 @@
        }
 #if DEBUG_TRANSPORT
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Bandwidth available for transmission to `%4s'\n",
+                 "Have %u bytes of bandwidth available for transmission to 
`%4s' right now\n",
+                 th->notify_size,
                  GNUNET_i2s (&n->id));
 #endif
       if ( (ret == NULL) ||