SSU: OMF nextSendDelay not calculated properly
The current logic will ignore the value of PeerState.getNextDelay if it happens to the last or only peer with something to send. The patch below fixes that.
diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java
index 2159b7707..03ec420dc 100644
--- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java
+++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java
@@ -270,8 +270,8 @@ class OutboundMessageFragments {
List<OutboundMessageState> states = null;
// Keep track of how many we've looked at, since we don't start the iterator at the beginning.
int peersProcessed = 0;
+ int nextSendDelay = Integer.MAX_VALUE;
while (_alive && (states == null) ) {
- int nextSendDelay = Integer.MAX_VALUE;
// no, not every time - O(n**2) - do just before waiting below
//finishMessages();
@@ -288,8 +288,8 @@ class OutboundMessageFragments {
// Otherwise, wait()
long now = _context.clock().now();
while (_iterator.hasNext()) {
- peer = _iterator.next();
- int remaining = peer.finishMessages(now);
+ PeerState p = _iterator.next();
+ int remaining = p.finishMessages(now);
if (remaining <= 0) {
// race with add()
_iterator.remove();
@@ -298,20 +298,19 @@ class OutboundMessageFragments {
continue;
}
peersProcessed++;
- states = peer.allocateSend();
+ states = p.allocateSend();
if (states != null) {
+ peer = p;
// we have something to send and we will be returning it
break;
- } else if (peersProcessed >= _activePeers.size()) {
+ }
+ int delay = p.getNextDelay();
+ if (delay < nextSendDelay)
+ nextSendDelay = delay;
+
+ if (peersProcessed >= _activePeers.size()) {
// we've gone all the way around, time to sleep
break;
- } else {
- // Update the minimum delay for all peers
- // which will be used if we found nothing to send across all peers
- int delay = peer.getNextDelay();
- if (delay < nextSendDelay)
- nextSendDelay = delay;
- peer = null;
}
}
@@ -329,8 +328,10 @@ class OutboundMessageFragments {
// use max of 1 second so finishMessages() and/or PeerState.finishMessages()
// gets called regularly
int toWait = Math.min(Math.max(nextSendDelay, 10), MAX_WAIT);
- //if (_log.shouldLog(Log.DEBUG))
- // _log.debug("wait for " + toWait);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("wait for " + toWait);
+
+ nextSendDelay = Integer.MAX_VALUE;
// wait.. or somethin'
synchronized (_activePeers) {
try {Activity
mentioned in issue #1 (closed)
comment:1 Changed 3 years ago by zzz
to be decided:
do core, router, and streaming go as libs into /usr/share/java? If router.jar goes there, we may need an additional package for all the startup stuff (but we may need that anyway)
don't get dup files error when upgrading like the last time we moved stuff
split up i2ptunnel into jar and war pkgs (lib and UI) ?
-
comment:2 Changed 3 years ago by zzz
Here's what I came up with. libi2p-xxx jars would go in /usr/share/java.
We will also need to split up clients.config and i2ptunnel.config into separate files under clients.config.d/ and i2ptunnel.config.d/
61824 i2p_0.9.32-19-1-1-517fe58b-1_all.deb 3651464 i2p-console_0.9.32-19-1-1-517fe58b-1_all.deb 2637800 i2p-doc_0.9.32-19-1-1-517fe58b-1_all.deb 266360 i2p-jetty_0.9.32-19-1-1-517fe58b-1_all.deb 338310 i2p-router_0.9.32-19-1-1-517fe58b-1_all.deb 419264 i2p-router-base_0.9.32-19-1-1-517fe58b-1_all.deb 1149818 i2p-snark_0.9.32-19-1-1-517fe58b-1_all.deb 519954 i2p-susidns_0.9.32-19-1-1-517fe58b-1_all.deb 571622 i2p-susimail_0.9.32-19-1-1-517fe58b-1_all.deb 636686 i2p-tunnel-ui_0.9.32-19-1-1-517fe58b-1_all.deb 302244 i2p-website_0.9.32-19-1-1-517fe58b-1_all.deb 351304 libi2p-addressbook-java_0.9.32-19-1-1-517fe58b-1_all.deb 279654 libi2p-bob-java_0.9.32-19-1-1-517fe58b-1_all.deb 1043940 libi2p-core-java_0.9.32-19-1-1-517fe58b-1_all.deb 1841990 libi2p-router-java_0.9.32-19-1-1-517fe58b-1_all.deb 361250 libi2p-sam-java_0.9.32-19-1-1-517fe58b-1_all.deb 431752 libi2p-streaming-java_0.9.32-19-1-1-517fe58b-1_all.deb 621162 libi2p-tunnel-java_0.9.32-19-1-1-517fe58b-1_all.deb 5072 libjbigi-jni_0.9.32-19-1-1-517fe58b-1_amd64.deb
-
comment:3 Changed 3 years ago by zzz
Add a subticket #2161.
-
comment:4 Changed 3 years ago by zzz
Add a subticket #2164.
-
comment:5 Changed 3 years ago by str4d
Keywords:extensibility standards debian ubuntu build release added Status:new → open
-
comment:6 Changed 2 years ago by zzz
Milestone:0.9.34 → 0.9.42
-
comment:1 Changed 3 years ago by zzz
to be decided:
do core, router, and streaming go as libs into /usr/share/java? If router.jar goes there, we may need an additional package for all the startup stuff (but we may need that anyway)
don't get dup files error when upgrading like the last time we moved stuff
split up i2ptunnel into jar and war pkgs (lib and UI) ?
-
comment:2 Changed 3 years ago by zzz
Here's what I came up with. libi2p-xxx jars would go in /usr/share/java.
We will also need to split up clients.config and i2ptunnel.config into separate files under clients.config.d/ and i2ptunnel.config.d/
61824 i2p_0.9.32-19-1-1-517fe58b-1_all.deb 3651464 i2p-console_0.9.32-19-1-1-517fe58b-1_all.deb 2637800 i2p-doc_0.9.32-19-1-1-517fe58b-1_all.deb 266360 i2p-jetty_0.9.32-19-1-1-517fe58b-1_all.deb 338310 i2p-router_0.9.32-19-1-1-517fe58b-1_all.deb 419264 i2p-router-base_0.9.32-19-1-1-517fe58b-1_all.deb 1149818 i2p-snark_0.9.32-19-1-1-517fe58b-1_all.deb 519954 i2p-susidns_0.9.32-19-1-1-517fe58b-1_all.deb 571622 i2p-susimail_0.9.32-19-1-1-517fe58b-1_all.deb 636686 i2p-tunnel-ui_0.9.32-19-1-1-517fe58b-1_all.deb 302244 i2p-website_0.9.32-19-1-1-517fe58b-1_all.deb 351304 libi2p-addressbook-java_0.9.32-19-1-1-517fe58b-1_all.deb 279654 libi2p-bob-java_0.9.32-19-1-1-517fe58b-1_all.deb 1043940 libi2p-core-java_0.9.32-19-1-1-517fe58b-1_all.deb 1841990 libi2p-router-java_0.9.32-19-1-1-517fe58b-1_all.deb 361250 libi2p-sam-java_0.9.32-19-1-1-517fe58b-1_all.deb 431752 libi2p-streaming-java_0.9.32-19-1-1-517fe58b-1_all.deb 621162 libi2p-tunnel-java_0.9.32-19-1-1-517fe58b-1_all.deb 5072 libjbigi-jni_0.9.32-19-1-1-517fe58b-1_amd64.deb
-
comment:3 Changed 3 years ago by zzz
Add a subticket #2161.
-
comment:4 Changed 3 years ago by zzz
Add a subticket #2164.
-
comment:5 Changed 3 years ago by str4d
Keywords:extensibility standards debian ubuntu build release added Status:new → open
-
comment:6 Changed 2 years ago by zzz
Milestone:0.9.34 → 0.9.42
mentioned in commit 371062d9
mentioned in commit d8451354
