AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tunnels: Pull now() calls out of loops

Browse Source
This commit is contained in:
zzz
2023-01-26 17:04:55 -05:00
parent 542a51658d
commit 886adb12fc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
View File

@@ -166,6 +166,7 @@ public class TunnelPool {
private TunnelInfo selectTunnel(boolean allowRecurseOnFail) {
boolean avoidZeroHop = !_settings.getAllowZeroHop();
long now = _context.clock().now();
synchronized (_tunnels) {
if (_tunnels.isEmpty()) {
if (_log.shouldLog(Log.WARN))
@@ -181,7 +182,7 @@ public class TunnelPool {
if (_lastSelectedIdx >= _tunnels.size())
_lastSelectedIdx = 0;
TunnelInfo info = _tunnels.get(_lastSelectedIdx);
if ( (info.getLength() > 1) && (info.getExpiration() > _context.clock().now()) ) {
if (info.getLength() > 1 && info.getExpiration() > now) {
// avoid outbound tunnels where the 1st hop is backlogged
if (_settings.isInbound() || !_context.commSystem().isBacklogged(info.getPeer(1))) {
return info;
@@ -201,7 +202,7 @@ public class TunnelPool {
// randomly
for (int i = 0; i < _tunnels.size(); i++) {
TunnelInfo info = _tunnels.get(i);
if (info.getExpiration() > _context.clock().now()) {
if (info.getExpiration() > now) {
// avoid outbound tunnels where the 1st hop is backlogged
if (_settings.isInbound() || info.getLength() <= 1 ||
!_context.commSystem().isBacklogged(info.getPeer(1))) {
@@ -243,12 +244,13 @@ public class TunnelPool {
TunnelInfo selectTunnel(Hash closestTo) {
boolean avoidZeroHop = !_settings.getAllowZeroHop();
TunnelInfo rv = null;
long now = _context.clock().now();
synchronized (_tunnels) {
if (!_tunnels.isEmpty()) {
if (_tunnels.size() > 1)
Collections.sort(_tunnels, new TunnelInfoComparator(closestTo, avoidZeroHop));
for (TunnelInfo info : _tunnels) {
if (info.getExpiration() > _context.clock().now()) {
if (info.getExpiration() > now) {
rv = info;
break;
}