Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv29289/src/freenet

Modified Files:
        OpenConnectionManager.java 
Log Message:
Total amount of data queued is (almost) already available from PH....

Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- OpenConnectionManager.java  8 Oct 2003 23:47:33 -0000       1.117
+++ OpenConnectionManager.java  9 Oct 2003 00:08:58 -0000       1.118
@@ -809,7 +809,7 @@
                int outbound = 0;
                int outboundNotInRoutingtable=0;
                int inbound = 0;
-               //long sendQueueSize = 0;
+               long sendQueueSize = 0;
                long totalDataSent = 0;
                long receiveQueueSize = 0;
                long totalDataReceived = 0;
@@ -1015,7 +1015,7 @@
                        pw.println("<br>Number of inbound connections: " + inbound);
                        pw.println("<br>Number of connections sending messages: 
"+sending);
                        pw.println("<br>Number of connections receiving messages: 
"+receiving);
-                       //pw.println("<br>Bytes waiting to be sent: " + sendQueueSize);
+                       pw.println("<br>Bytes waiting to be sent: " + sendQueueSize);
                        pw.println("<br>Outbound connections that are to peers not in 
the routingtable: " + 
                                           100*(new 
Float(outboundNotInRoutingtable).floatValue() /
                                                        new 
Float(outbound).floatValue()) +
@@ -1037,7 +1037,9 @@
                                 (sending + receiving) + 
                                 "&nbsp;("+sending+"/"+receiving+")</td></tr>");
                        if(viewLevel>0) {
-                               pw.println("<tr><td>Data waiting to be 
received</td><td width =10></td><td>" + 
+                               pw.println("<tr><td>Data waiting to be 
transmitted/received</td><td width =10></td><td>" +
+                                                  format(sendQueueSize).replaceAll(" 
","&nbsp;") +
+                                                  "/"+ 
                                                   
format(receiveQueueSize).replaceAll(" ","&nbsp;") + 
                                                   "</td></tr>");
                                pw.println("<tr><td>Amount of data 
transmitted/received over currently open connections</td>" + 
@@ -1057,8 +1059,8 @@
                                
                                //pw.println("<tr><td>&nbsp;</td></tr>");
                        } else {
-                               pw.println("<tr><td>Data waiting to be 
received</td><td width =10></td><td>" + 
-                                                  format(receiveQueueSize) + 
+                               pw.println("<tr><td>Data waiting to be 
transfered</td><td width =10></td><td>" +
+                                                  
format(sendQueueSize+receiveQueueSize)+ 
                                                   "</td></tr>");
                                
pw.println("<tr><td>&nbsp;</td></tr><tr><td>&nbsp;</td></tr>");
                        }

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to