From c75ff538a361dab61126413c8423a4b3b48f802c Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 23 May 2009 20:23:28 +0000 Subject: [PATCH] a little peers.jsp cleanup --- .../i2p/router/transport/ntcp/NTCPTransport.java | 10 ++-------- .../i2p/router/transport/udp/UDPTransport.java | 16 +++++++--------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index 00e78f350..d2f2f8bc4 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -627,8 +627,6 @@ public class NTCPTransport extends TransportImpl { long sendTotal = 0; long recvTotal = 0; int numPeers = 0; - int readingPeers = 0; - int writingPeers = 0; float bpsSend = 0; float bpsRecv = 0; long totalUptime = 0; @@ -636,7 +634,7 @@ public class NTCPTransport extends TransportImpl { long totalRecv = 0; StringBuffer buf = new StringBuffer(512); - buf.append("NTCP connections: ").append(peers.size()); + buf.append("

NTCP connections: ").append(peers.size()); buf.append(" limit: ").append(getMaxConnections()); buf.append(" timeout: ").append(DataHelper.formatDuration(_pumper.getIdleTimeout())); buf.append("
\n"); @@ -700,7 +698,6 @@ public class NTCPTransport extends TransportImpl { buf.append("").append(outQueue).append(" message"); if (outQueue > 1) buf.append("s"); - writingPeers++; } buf.append("").append(con.getConsecutiveBacklog() > 0 ? "true" : "false"); long readTime = con.getReadTime(); @@ -708,7 +705,6 @@ public class NTCPTransport extends TransportImpl { buf.append("No"); } else { buf.append("For ").append(DataHelper.formatDuration(readTime)); - readingPeers++; } buf.append("\n"); out.write(buf.toString()); @@ -726,9 +722,7 @@ public class NTCPTransport extends TransportImpl { buf.append("\n"); } - buf.append("\n"); - buf.append("Peers currently reading I2NP messages: ").append(readingPeers).append("
\n"); - buf.append("Peers currently writing I2NP messages: ").append(writingPeers).append("
\n"); + buf.append("

\n"); out.write(buf.toString()); buf.setLength(0); } diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index 5e4fa0c19..7cd94f053 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -1747,7 +1747,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority int numPeers = 0; StringBuffer buf = new StringBuffer(512); - buf.append("UDP connections: ").append(peers.size()); + buf.append("

UDP connections: ").append(peers.size()); buf.append(" limit: ").append(getMaxConnections()); buf.append(" timeout: ").append(DataHelper.formatDuration(_expireTimeout)); buf.append("
\n"); @@ -1984,8 +1984,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority buf.append(sendTotal).append("").append(recvTotal).append("\n"); buf.append(" ").append(resentTotal); buf.append("").append(dupRecvTotal).append("\n"); - buf.append(" \n"); - buf.append(""); + buf.append("

\n"); long bytesTransmitted = _context.bandwidthLimiter().getTotalAllocatedOutboundBytes(); // NPE here early double averagePacketSize = _context.statManager().getRate("udp.sendPacketSize").getLifetimeAverageValue(); @@ -1994,12 +1993,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority double nondupSent = ((double)bytesTransmitted - ((double)resentTotal)*averagePacketSize); double bwResent = (nondupSent <= 0 ? 0d : ((((double)resentTotal)*averagePacketSize) / nondupSent)); buf.append("Percentage of bytes retransmitted (lifetime): ").append(formatPct(bwResent)); - buf.append(" (includes retransmission required by packet loss)
\n"); - buf.append("\n"); + buf.append(" (includes retransmission required by packet loss)

\n"); out.write(buf.toString()); buf.setLength(0); out.write(KEY); - out.write("\n"); } private static final DecimalFormat _fmt = new DecimalFormat("#,##0.00"); @@ -2015,8 +2012,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority } } - private static final String KEY = "" + - "peer: the remote peer (< inbound, > outbound, v means they offer to introduce us, ^ means we offer to introduce them)
\n" + + private static final String KEY = "

" + + "peer: the remote peer
\n" + + "dir: v means they offer to introduce us, ^ means we offer to introduce them
\n" + "idle: the idle time is how long since a packet has been received or sent
\n" + "in/out: the rates show a smoothed inbound and outbound transfer rate (KBytes per second)
\n" + "up: the uptime is how long ago this session was established
\n" + @@ -2034,7 +2032,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority "recv: the number of packets received from the peer
\n" + "resent: the number of packets retransmitted to the peer
\n" + "dupRecv: the number of duplicate packets received from the peer" + - "\n"; + "

\n"; /** * Cache the bid to reduce object churn