[freenet-cvs] r10415 - in trunk/freenet/src/freenet: node support

[t...@freenetproject.org]

Author: toad
Date: 2006-09-06 20:52:46 +0000 (Wed, 06 Sep 2006)
New Revision: 10415

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/support/Logger.java
Log:
Even more bandwidth usage logging (should be low impact though, only once per 2 
seconds).

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-09-06 19:44:36 UTC (rev 
10414)
+++ trunk/freenet/src/freenet/node/Node.java    2006-09-06 20:52:46 UTC (rev 
10415)
@@ -2957,6 +2957,8 @@
        public void maybeUpdateNodeIOStats(long now) {
                if(now > nextNodeIOStatsUpdateTime) {
                        long[] io_stats = IOStatisticCollector.getTotalIO();
+                       long outdiff;
+                       long indiff;
                        synchronized(ioStatSync) {
                                previous_output_stat = last_output_stat;
                                previous_input_stat = last_input_stat;
@@ -2964,7 +2966,11 @@
                                last_output_stat = io_stats[ 0 ];
                                last_input_stat = io_stats[ 1 ];
                                last_io_stat_time = now;
+                               outdiff = last_output_stat - 
previous_output_stat;
+                               indiff = last_input_stat - previous_input_stat;
                        }
+                       if(logMINOR)
+                               Logger.minor(this, "Last 2 seconds: input: 
"+indiff+" output: "+outdiff);
                        nextNodeIOStatsUpdateTime = now + 
nodeIOStatsUpdateInterval;
                }
        }

Modified: trunk/freenet/src/freenet/support/Logger.java
===================================================================
--- trunk/freenet/src/freenet/support/Logger.java       2006-09-06 19:44:36 UTC 
(rev 10414)
+++ trunk/freenet/src/freenet/support/Logger.java       2006-09-06 20:52:46 UTC 
(rev 10415)
@@ -67,6 +67,10 @@
            logger.log(o, s, e, ERROR);
        }

+       public synchronized static void minor(Class c, String s) {
+               logger.log(c, s, MINOR);
+       }
+       
        public synchronized static void minor(Object o, String s) {
            logger.log(o, s, MINOR);
        }