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

Add CachedIteratorAbstractCollection

Browse Source 
Update PeerState.java to use CachedIteratorAbstract
Add some debugging lines to determine cause(s) of higher udp.sendFailed/sendAggressiveFailed stats
This commit is contained in:
slumlord
2018-08-06 08:54:44 +00:00
parent 775188a36c
commit 0b3abb3b63
5 changed files with 305 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
router/java/src/net/i2p/router/transport/udp/PeerState.java
View File

@ -11,14 +11,12 @@ import java.util.Map;
import java.util.Set;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
import net.i2p.data.Hash;
import net.i2p.data.SessionKey;
import net.i2p.router.OutNetMessage;
import net.i2p.router.RouterContext;
import net.i2p.router.util.CachedIteratorArrayList;
import net.i2p.router.util.CoDelPriorityBlockingQueue;
import net.i2p.router.util.CachedIteratorAbstractCollection;
import net.i2p.router.util.PriBlockingQueue;
import net.i2p.util.Log;
import net.i2p.util.ConcurrentHashSet;
@ -210,7 +208,7 @@ public class PeerState {
* Mostly messages that have been transmitted and are awaiting acknowledgement,
* although there could be some that have not been sent yet.
*/
private final List<OutboundMessageState> _outboundMessages;
private final CachedIteratorAbstractCollection<OutboundMessageState> _outboundMessages;
/**
* Priority queue of messages that have not yet been sent.
@ -370,7 +368,7 @@ public class PeerState {
_rtt = INIT_RTT;
_rttDeviation = _rtt;
_inboundMessages = new HashMap<Long, InboundMessageState>(8);
_outboundMessages = new CachedIteratorArrayList<OutboundMessageState>(32);
_outboundMessages = new CachedIteratorAbstractCollection<OutboundMessageState>();
//_outboundQueue = new CoDelPriorityBlockingQueue(ctx, "UDP-PeerState", 32);
_outboundQueue = new PriBlockingQueue<OutboundMessageState>(ctx, "UDP-PeerState", 32);
// all createRateStat() moved to EstablishmentManager
@ -1568,7 +1566,7 @@ public class PeerState {
if (_dead) {
dropOutbound();
return 0;
}
}
int rv = 0;
List<OutboundMessageState> succeeded = null;
@ -1586,6 +1584,7 @@ public class PeerState {
iter.remove();
if (_retransmitter == state)
_retransmitter = null;
_log.debug("CachedIteratorAbstractCollection: sendFailed update" + state);
_context.statManager().addRateData("udp.sendFailed", state.getPushCount());
if (failed == null) failed = new ArrayList<OutboundMessageState>(4);
failed.add(state);
@ -1593,6 +1592,7 @@ public class PeerState {
iter.remove();
if (state == _retransmitter)
_retransmitter = null;
_log.debug("CachedIteratorAbstractCollection: sendAggressiveFailed update" + state);
_context.statManager().addRateData("udp.sendAggressiveFailed", state.getPushCount());
if (failed == null) failed = new ArrayList<OutboundMessageState>(4);
failed.add(state);

209
router/java/src/net/i2p/router/util/CachedIteratorAbstractCollection.java Normal file
View File

@ -0,0 +1,209 @@
// Extend `java.util.AbstractCollection` to create a collection that can be iterated over without creation of a new
// object
// https://docs.oracle.com/javase/7/docs/api/java/util/AbstractCollection.html
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
// The Node class below is from Java's LinkedList.java
package net.i2p.router.util;
import java.util.AbstractCollection;
import java.util.Iterator;
import java.util.NoSuchElementException;
import net.i2p.I2PAppContext;
import net.i2p.util.Log;
public class CachedIteratorAbstractCollection<E> extends AbstractCollection<E> {
// FOR DEBUGGING & LOGGING PURPOSES
Log log = I2PAppContext.getGlobalContext().logManager().getLog(CachedIteratorAbstractCollection.class);
// Cached Iterator object
private final CachedIterator iterator = new CachedIterator();
// Size of the AbstractCollectionTest object
private transient int size = 0;
/**
* Node object that contains:
* (1) Data object
* (2) Link to previous Node object
* (3) Link to next Node object
*/
private static class Node<E> {
E item;
Node<E> next;
Node<E> prev;
Node(Node<E> prev, E element, Node<E> next) {
this.item = element;
this.prev = prev;
this.next = next;
}
}
// First Node in the AbstractCollectionTest object
private transient Node<E> first;
// Last Node in the AbstractCollectionTest object
private transient Node<E> last;
/**
* Default constructor
*/
public CachedIteratorAbstractCollection() {
}
/**
* Adds a data object (element) as a Node and sets previous/next pointers accordingly
*
*/
@Override
public boolean add(E element) {
if (this.size == 0) {
final Node<E> newNode = new Node<>(null, element, null);
this.first = newNode;
this.last = newNode;
} else {
final Node<E> newLast = new Node<>(this.last, element, null);
this.last.next = newLast;
this.last = newLast;
}
this.size++;
log.debug("CachedIteratorAbstractCollection: Element added");
return true;
}
/**
* Clears the AbstractCollectionTest object, all pointers reset to 'null'
*
*/
@Override
public void clear() {
this.first = null;
this.last = null;
this.size = 0;
iterator.reset();
log.debug("CachedIteratorAbstractCollection: Cleared");
}
/**
* Iterator: Resets and returns CachedIterator
*
*/
public Iterator<E> iterator() {
iterator.reset();
return iterator;
}
/**
* Inner CachedIterator class - implements hasNext(), next() & remove()
*
*/
private class CachedIterator implements Iterator<E> {
private transient boolean nextCalled;
// Iteration Index
private transient Node<E> itrIndexNode = first;
// Methods to support iteration
/**
* Reset iteration
*/
private void reset() {
itrIndexNode = first;
nextCalled = false;
}
/**
* If nextCalled is true (i.e. next() has been called at least once),
* remove() will remove the last returned Node
*
*/
@Override
public void remove() {
if (nextCalled) {
if (itrIndexNode != null) {
if (itrIndexNode.prev.prev != null) {
itrIndexNode.prev = itrIndexNode.prev.prev;
itrIndexNode.prev.next = itrIndexNode;
} else {
itrIndexNode.prev = null;
first = itrIndexNode;
}
} else {
if (last.prev != null) {
last.prev.next = null;
last = last.prev;
} else {
nextCalled = false;
clear();
log.debug("CachedIteratorAbstractCollection: Element Removed");
return;
}
}
size--;
nextCalled = false;
log.debug("CachedIteratorAbstractCollection: Element Removed");
} else {
throw new IllegalStateException();
}
}
/**
* Returns true as long as current Iteration Index Node (itrIndexNode)
* is non-null
*
*/
public boolean hasNext() {
return itrIndexNode != null;
}
/**
* Returns the next node in the iteration
*
*/
public E next() {
if (this.hasNext()) {
Node<E> node = itrIndexNode;
itrIndexNode = itrIndexNode.next;
nextCalled = true;
return node.item;
} else {
throw new NoSuchElementException();
}
}
}
/**
* Return size of current LinkedListTest object
*/
public int size() { return this.size; }
}