Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv25995/src/freenet
Modified Files:
OpenConnectionManager.java
Log Message:
Removed send queue sizes since they wont work anyways until there is PH support
implemented in the OCM html view.
Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- OpenConnectionManager.java 8 Oct 2003 22:54:18 -0000 1.116
+++ OpenConnectionManager.java 8 Oct 2003 23:47:33 -0000 1.117
@@ -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;
@@ -932,16 +932,16 @@
buffer.append(sepAlignRight+ch.messages());
if(useOldStyle || viewLevel > 0){
- if(ch.sending())
- buffer.append
- (sepAlignRight +
- (viewLevel > 1
- ? String.valueOf(ch.sendQueueSize())
- : format(ch.sendQueueSize())
- )
- );
- else
- buffer.append(sepAlignRight+"-");
+ //if(ch.sending())
+ // buffer.append
+ // (sepAlignRight +
+ // (viewLevel > 1
+ // ? String.valueOf(ch.sendQueueSize())
+ // : format(ch.sendQueueSize())
+ // )
+ // );
+ //else
+ // buffer.append(sepAlignRight+"-");
buffer.append
(sepAlignRight +
(viewLevel > 1
@@ -977,7 +977,7 @@
).replaceAll(" "," ")
);
}
- sendQueueSize += ch.sendQueueSize();
+ //sendQueueSize += ch.sendQueueSize();
receiveQueueSize += ch.receiveQueueSize();
totalDataSent += ch.totalDataSent();
totalDataReceived += ch.totalDataReceived();
@@ -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,9 +1037,7 @@
(sending + receiving) +
" ("+sending+"/"+receiving+")</td></tr>");
if(viewLevel>0) {
- pw.println("<tr><td>Data waiting to be
transmitted/received</td><td width =10></td><td>" +
- format(sendQueueSize).replaceAll("
"," ") +
- "/" +
+ pw.println("<tr><td>Data waiting to be
received</td><td width =10></td><td>" +
format(receiveQueueSize).replaceAll(" "," ") +
"</td></tr>");
pw.println("<tr><td>Amount of data
transmitted/received over currently open connections</td>" +
@@ -1059,8 +1057,8 @@
//pw.println("<tr><td> </td></tr>");
} else {
- pw.println("<tr><td>Data waiting to be
transferred</td><td width =10></td><td>" +
-
format(sendQueueSize+receiveQueueSize) +
+ pw.println("<tr><td>Data waiting to be
received</td><td width =10></td><td>" +
+ format(receiveQueueSize) +
"</td></tr>");
pw.println("<tr><td> </td></tr><tr><td> </td></tr>");
}
@@ -1145,10 +1143,10 @@
(iSortingMode==6?"-6":"6") + "'>" +
(Math.abs(iSortingMode)==6?sImgClause:"") + "
Messages</A></th>");
if(useOldStyle || viewLevel>0) {
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
- (iSortingMode==4?"-4":"4") + "'>" +
- (Math.abs(iSortingMode)==4?sImgClause:"") + "
Send queue</A></th>");
+ //pw.print("<th><A HREF='" + req.getRequestURI() +
+ // "?setSorting=" +
+ // (iSortingMode==4?"-4":"4") + "'>" +
+ // (Math.abs(iSortingMode)==4?sImgClause:"") + "
Send queue</A></th>");
pw.print("<th><A HREF='" + req.getRequestURI() +
"?setSorting=" +
(iSortingMode==ConnectionHandlerComparator.DATASENT?"-":"") +
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
