[freenet-cvs] r17814 - trunk/freenet/src/freenet/node/simulator

[t...@freenetproject.org]

Author: toad
Date: 2008-02-12 13:31:45 +0000 (Tue, 12 Feb 2008)
New Revision: 17814

Modified:
   trunk/freenet/src/freenet/node/simulator/RealNodeTest.java
Log:
Show timer too

Modified: trunk/freenet/src/freenet/node/simulator/RealNodeTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeTest.java  2008-02-12 
13:28:41 UTC (rev 17813)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeTest.java  2008-02-12 
13:31:45 UTC (rev 17814)
@@ -100,6 +100,7 @@

     // FIXME factor out to some simulator utility class.
        static void waitForAllConnected(Node[] nodes) throws 
InterruptedException {
+               long tStart = System.currentTimeMillis();
                while(true) {
                        int countFullyConnected = 0;
                        int countReallyConnected = 0;
@@ -138,8 +139,9 @@
                                System.err.println();
                                return;
                        } else {
-                               System.err.println("Waiting for nodes to be 
fully connected: "+countFullyConnected+" / "+nodes.length+" 
("+totalConnections+" / "+totalPeers+" connections total) - backed off 
"+totalBackedOff+" ping min/avg/max 
"+(int)minPingTime+"/"+(int)(totalPingTime/nodes.length)+"/"+(int)maxPingTime);
-                               Logger.normal(RealNodeTest.class, "Waiting for 
nodes to be fully connected: "+countFullyConnected+" / "+nodes.length+" 
("+totalConnections+" / "+totalPeers+" connections total) - backed off 
"+totalBackedOff+" ping min/avg/max 
"+(int)minPingTime+"/"+(int)(totalPingTime/nodes.length)+"/"+(int)maxPingTime);
+                               long tDelta = (System.currentTimeMillis() - 
tStart)/1000;
+                               System.err.println("Waiting for nodes to be 
fully connected: "+countFullyConnected+" / "+nodes.length+" 
("+totalConnections+" / "+totalPeers+" connections total) - backed off 
"+totalBackedOff+" ping min/avg/max 
"+(int)minPingTime+"/"+(int)(totalPingTime/nodes.length)+"/"+(int)maxPingTime+" 
at "+tDelta+'s');
+                               Logger.normal(RealNodeTest.class, "Waiting for 
nodes to be fully connected: "+countFullyConnected+" / "+nodes.length+" 
("+totalConnections+" / "+totalPeers+" connections total) - backed off 
"+totalBackedOff+" ping min/avg/max 
"+(int)minPingTime+"/"+(int)(totalPingTime/nodes.length)+"/"+(int)maxPingTime+" 
at "+tDelta+'s');
                                Thread.sleep(1000);
                        }
                }