Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv16370/src/freenet
Modified Files:
PeerHandler.java OpenConnectionManager.java
Log Message:
Display message failed-to-sent count in OCM PeerHandler mode (max details).
Index: PeerHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerHandler.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -w -r1.43 -r1.44
--- PeerHandler.java 4 Nov 2003 16:53:23 -0000 1.43
+++ PeerHandler.java 5 Nov 2003 14:02:54 -0000 1.44
@@ -142,9 +142,11 @@
{
String messageType;
int sent=0;
+ int sendFailed=0;
int received=0;
+ int receiveFailed=0;
}
- public String toHTML(){
+ public String toHTML(boolean renderFailCount){
String retval = "<TABLE BORDER = 1 BORDERCOLOR = #91A7DE
cellspacing = 0 cellpadding=0><TR><TD>";
retval += "<TABLE border=0 cellspacing = 0>";
Hashtable h = new Hashtable();
@@ -155,7 +157,6 @@
String key = (String) eSent.nextElement();
String messageType = key.substring(0,
key.indexOf(":"));
String messageStatus =
key.substring(key.indexOf(":")+1, key.length());
- if
(messageStatus.equalsIgnoreCase(String.valueOf(true))) {
int sentCount = ((myInt)
messagesSentByTypeAndStatus.get(key)).intValue;
MessageCountByType val =
(MessageCountByType) h.get(messageType);
if (val == null){
@@ -163,9 +164,11 @@
val.messageType = messageType;
h.put(val.messageType, val);
}
+ if
(messageStatus.equalsIgnoreCase(String.valueOf(true)))
val.sent += sentCount;
- h.put(messageType, val); //dont care
about performance;
- } //What to do else
+ else
+ val.sendFailed += sentCount;
+
}
}
synchronized (messagesReceivedByTypeAndStatus) {
@@ -174,7 +177,7 @@
String key = (String) eSent.nextElement();
String messageType = key.substring(0,
key.indexOf(":"));
String messageStatus =
key.substring(key.indexOf(":")+1, key.length());
- if
(messageStatus.equalsIgnoreCase(String.valueOf(true))) {
+
int receivedCount = ((myInt)
messagesReceivedByTypeAndStatus.get(key)).intValue;
MessageCountByType val =
(MessageCountByType) h.get(messageType);
if (val == null){
@@ -182,16 +185,23 @@
val.messageType = messageType;
h.put(val.messageType, val);
}
+ if
(messageStatus.equalsIgnoreCase(String.valueOf(true)))
val.received += receivedCount;
-
- } //What to do else
+ else
+ val.receiveFailed += receivedCount;
}
}
if (h.size() > 0) {
+ if(renderFailCount)
+ retval += "<TR BGCOLOR = #E7EDFE><TD><font
size = 2>Type</FONT></TD><TD><font size =
2>Sent (failed)/Received (failed)</FONT></TD></TD>";
+ else
retval += "<TR BGCOLOR = #E7EDFE><TD><font size =
2>Type</FONT></TD><TD><font size = 2>Sent/Received</FONT></TD></TD>";
Enumeration e = h.keys();
while (e.hasMoreElements()) {
MessageCountByType val = (MessageCountByType)
h.get(e.nextElement());
+ if(renderFailCount)
+ retval += "<TR><TD><font size = 2>" +
val.messageType + "</FONT></TD><TD ALIGN = right><font size = 2>" + val.sent +
" ("+val.sendFailed+")/" + val.received +
" ("+val.receiveFailed+")</FONT></TD></TR>";
+ else
retval += "<TR><TD><font size = 2>" +
val.messageType + "</FONT></TD><TD ALIGN = right><font size = 2>" + val.sent + "/" +
val.received + "</FONT></TD></TR>";
}
}else
Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -w -r1.162 -r1.163
--- OpenConnectionManager.java 4 Nov 2003 16:53:23 -0000 1.162
+++ OpenConnectionManager.java 5 Nov 2003 14:02:55 -0000 1.163
@@ -2101,7 +2101,7 @@
fullString =
"<TD>"+rtGraphValueLabelString+"</TD><TD>" + rtGraphValueDataString+ "</TD>";
}
if(renderAcc != null){
- fullString += "<TD ROWSPAN =18
valign=TOP>"+renderAcc.toHTML()+"</TD>";
+ fullString += "<TD ROWSPAN =18
valign=TOP>"+renderAcc.toHTML(viewLevel>1)+"</TD>";
}
pw.println("<TR><TD>"+labelString+"</TD><TD>" + dataString+ "</TD>");
//pw.println("<TD ROWSPAN = "+(v2==null?"2":"3")+"> </TD><TD ROWSPAN
=
"+(v2==null?"2":"3")+">[History graph here]</TD>"+fullString+rtGraphString+"</TR>");
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
