Author: toad
Date: 2006-04-07 15:57:19 +0000 (Fri, 07 Apr 2006)
New Revision: 8493
Modified:
trunk/freenet/src/freenet/node/ChainedRequestThrottle.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/RequestThrottle.java
trunk/freenet/src/freenet/node/Version.java
Log:
623: Logging relating to request throttles.
Modified: trunk/freenet/src/freenet/node/ChainedRequestThrottle.java
===================================================================
--- trunk/freenet/src/freenet/node/ChainedRequestThrottle.java 2006-04-07
11:56:30 UTC (rev 8492)
+++ trunk/freenet/src/freenet/node/ChainedRequestThrottle.java 2006-04-07
15:57:19 UTC (rev 8493)
@@ -8,8 +8,8 @@
private final RequestThrottle otherThrottle;
- public ChainedRequestThrottle(int rtt, float winsz, RequestThrottle
other) {
- super(rtt, winsz);
+ public ChainedRequestThrottle(int rtt, float winsz, RequestThrottle
other, String name) {
+ super(rtt, winsz, name);
otherThrottle = other;
}
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-04-07 11:56:30 UTC (rev
8492)
+++ trunk/freenet/src/freenet/node/Node.java 2006-04-07 15:57:19 UTC (rev
8493)
@@ -910,27 +910,27 @@
// FIXME make all the below arbitrary constants configurable!
archiveManager = new ArchiveManager(MAX_ARCHIVE_HANDLERS,
MAX_CACHED_ARCHIVE_DATA, MAX_ARCHIVE_SIZE, MAX_ARCHIVED_FILE_SIZE,
MAX_CACHED_ELEMENTS, random, tempFilenameGenerator);
- chkRequestThrottle = new RequestThrottle(5000, 2.0F);
+ chkRequestThrottle = new RequestThrottle(5000, 2.0F, "CHK
Request");
chkRequestStarter = new RequestStarter(this,
chkRequestThrottle, "CHK Request starter ("+portNumber+")");
chkFetchScheduler = new ClientRequestScheduler(false, false,
random, chkRequestStarter, this);
chkRequestStarter.setScheduler(chkFetchScheduler);
chkRequestStarter.start();
//insertThrottle = new ChainedRequestThrottle(10000, 2.0F,
requestThrottle);
// FIXME reenable the above
- chkInsertThrottle = new RequestThrottle(10000, 2.0F);
+ chkInsertThrottle = new RequestThrottle(10000, 2.0F, "CHK
Insert");
chkInsertStarter = new RequestStarter(this, chkInsertThrottle,
"CHK Insert starter ("+portNumber+")");
chkPutScheduler = new ClientRequestScheduler(true, false,
random, chkInsertStarter, this);
chkInsertStarter.setScheduler(chkPutScheduler);
chkInsertStarter.start();
- sskRequestThrottle = new RequestThrottle(5000, 2.0F);
+ sskRequestThrottle = new RequestThrottle(5000, 2.0F, "SSK
Request");
sskRequestStarter = new RequestStarter(this,
sskRequestThrottle, "SSK Request starter ("+portNumber+")");
sskFetchScheduler = new ClientRequestScheduler(false, true,
random, sskRequestStarter, this);
sskRequestStarter.setScheduler(sskFetchScheduler);
sskRequestStarter.start();
//insertThrottle = new ChainedRequestThrottle(10000, 2.0F,
requestThrottle);
// FIXME reenable the above
- sskInsertThrottle = new RequestThrottle(10000, 2.0F);
+ sskInsertThrottle = new RequestThrottle(10000, 2.0F, "SSK
Insert");
sskInsertStarter = new RequestStarter(this, sskInsertThrottle,
"SSK Insert starter ("+portNumber+")");
sskPutScheduler = new ClientRequestScheduler(true, true,
random, sskInsertStarter, this);
sskInsertStarter.setScheduler(sskPutScheduler);
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2006-04-07 11:56:30 UTC
(rev 8492)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2006-04-07 15:57:19 UTC
(rev 8493)
@@ -126,6 +126,9 @@
MessageItem[] messages = null;
messages = pn.grabQueuedMessageItems();
if(messages != null) {
+ for(int j=0;j<messages.length;j++) {
+ Logger.minor(this, "PS Sending:
"+(messages[j].msg == null ? "(not a Message)" :
messages[j].msg.getSpec().getName()));
+ }
// Send packets, right now, blocking, including any active
notifications
node.packetMangler.processOutgoingOrRequeue(messages, pn,
true);
continue;
Modified: trunk/freenet/src/freenet/node/RequestThrottle.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestThrottle.java 2006-04-07 11:56:30 UTC
(rev 8492)
+++ trunk/freenet/src/freenet/node/RequestThrottle.java 2006-04-07 15:57:19 UTC
(rev 8493)
@@ -16,10 +16,12 @@
private long _totalPackets = 0, _droppedPackets = 0;
private double _simulatedWindowSize = 2;
private final BootstrappingDecayingRunningAverage roundTripTime;
+ private final String name;
- RequestThrottle(long rtt, float winSize) {
+ RequestThrottle(long rtt, float winSize, String name) {
_simulatedWindowSize = 2;
roundTripTime = new BootstrappingDecayingRunningAverage(rtt,
10, 5*60*1000, 10);
+ this.name = name;
}
/**
@@ -46,6 +48,7 @@
setRoundTripTime(time);
_totalPackets++;
_simulatedWindowSize += PACKET_TRANSMIT_INCREMENT;
+ Logger.minor(this, "request completed in "+time+" for "+name);
}
/**
@@ -56,16 +59,17 @@
_droppedPackets++;
_totalPackets++;
_simulatedWindowSize *= PACKET_DROP_DECREASE_MULTIPLE;
+ Logger.minor(this, "request rejected overload: "+this);
}
private synchronized void setRoundTripTime(long rtt) {
roundTripTime.report(Math.max(rtt, 10));
- Logger.minor(this, "Reporting RTT: "+rtt);
+ Logger.minor(this, "Reporting RTT: "+rtt+" on "+this);
}
public synchronized String toString() {
return getDelay()+" ms, (w: "
+ _simulatedWindowSize + ", r:" +
roundTripTime.currentValue() + ", d:"
- + (((float) _droppedPackets / (float)
_totalPackets)) + "="+_droppedPackets+"/"+_totalPackets + ")";
+ + (((float) _droppedPackets / (float)
_totalPackets)) + "="+_droppedPackets+"/"+_totalPackets + ") for "+name;
}
}
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-04-07 11:56:30 UTC (rev
8492)
+++ trunk/freenet/src/freenet/node/Version.java 2006-04-07 15:57:19 UTC (rev
8493)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 622;
+ private static final int buildNumber = 623;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 591;
