[GNUnet-SVN] r3773 - in GNUnet/src: server transports util/boot util/os

[grothoff]

Author: grothoff
Date: 2006-11-14 20:34:20 -0800 (Tue, 14 Nov 2006)
New Revision: 3773

Modified:
   GNUnet/src/server/connection.c
   GNUnet/src/transports/tcp_old.c
   GNUnet/src/util/boot/startup.c
   GNUnet/src/util/os/statuscalls.c
Log:
fixing part of Mantis #1152

Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c      2006-11-15 03:40:09 UTC (rev 3772)
+++ GNUnet/src/server/connection.c      2006-11-15 04:34:20 UTC (rev 3773)
@@ -1401,9 +1401,11 @@
      fails, return (but clean up garbage) */
   if ( (SYSERR == outgoingCheck(priority)) ||
        (0 == prepareSelectedMessages(be)) ) {
+#if DEBUG_CONNECTION
     GE_LOG(ectx,
           GE_DEBUG | GE_DEVELOPER | GE_BULK,
           "Insufficient bandwidth or priority to send message\n");
+#endif
     expireSendBufferEntries(be);
     be->inSendBuffer = NO;
     return NO;             /* deferr further */

Modified: GNUnet/src/transports/tcp_old.c
===================================================================
--- GNUnet/src/transports/tcp_old.c     2006-11-15 03:40:09 UTC (rev 3772)
+++ GNUnet/src/transports/tcp_old.c     2006-11-15 04:34:20 UTC (rev 3773)
@@ -374,9 +374,13 @@
             &tcpSession->rbuff[tcpSession->pos],
             tcpSession->rsize - tcpSession->pos);
   if ( (ret > 0) &&
-       (stats != NULL) )
+       (stats != NULL) ) {
+    os_network_monitor_notify_transmission(coreAPI->load_monitor,
+                                          Download,
+                                          ret);
     stats->change(stat_bytesReceived,
                  ret);
+  }
   tcpSession->lastUse = get_time();
   if (ret == 0) {
     tcpDisconnect(tsession);
@@ -594,14 +598,16 @@
 
   } while ( (*sent == -1) &&
            (errno == EINTR) );
-
+  
   setBlocking(s, YES);
 
   if (*sent == SYSERR && (errno == EWOULDBLOCK || errno == EAGAIN))
     return NO;
   else if ( (*sent < 0) || (*sent > max) )
     return SYSERR;
-
+  os_network_monitor_notify_transmission(coreAPI->load_monitor,
+                                        Upload,
+                                        *sent);
   return YES;
 }
 

Modified: GNUnet/src/util/boot/startup.c
===================================================================
--- GNUnet/src/util/boot/startup.c      2006-11-15 03:40:09 UTC (rev 3772)
+++ GNUnet/src/util/boot/startup.c      2006-11-15 04:34:20 UTC (rev 3773)
@@ -36,7 +36,7 @@
 convertLogLevel(const char * level) {
   GE_KIND ret;
 
-  ret = GE_NOTHING;
+  ret = 0;
   if (ret || (0 == strcasecmp("debug", level)))
     ret |= GE_DEBUG;
   if (ret || (0 == strcasecmp("status", level)))

Modified: GNUnet/src/util/os/statuscalls.c
===================================================================
--- GNUnet/src/util/os/statuscalls.c    2006-11-15 03:40:09 UTC (rev 3772)
+++ GNUnet/src/util/os/statuscalls.c    2006-11-15 04:34:20 UTC (rev 3773)
@@ -123,13 +123,18 @@
 
   DirectionInfo download_info;
 
+  cron_t last_ifc_update;
+
 } LoadMonitor;
 
 void os_network_monitor_notify_transmission(struct LoadMonitor * monitor,
                                            NetworkDirection dir,
                                            unsigned long long delta) {
   MUTEX_LOCK(monitor->statusMutex);
-  monitor->globalTrafficBetweenProc.last_in += delta;
+  if (dir == Download)
+    monitor->globalTrafficBetweenProc.last_in += delta;
+  else
+    monitor->globalTrafficBetweenProc.last_out += delta;
   MUTEX_UNLOCK(monitor->statusMutex);
 }
 
@@ -387,8 +392,10 @@
   MUTEX_LOCK(monitor->statusMutex);
   now = get_time();
   if ( (monitor->useBasicMethod == NO) &&
-       (now - di->lastCall > 10 * cronSECONDS) )
+       (now - monitor->last_ifc_update > 10 * cronSECONDS) ) {
+    monitor->last_ifc_update = now;
     updateInterfaceTraffic(monitor);
+  }
   if (dir == Upload) {
     currentLoadSum = monitor->globalTrafficBetweenProc.last_out;
     for (i=0;i<monitor->ifcsSize;i++)