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

make _ackSinceCongestion atomic

Browse Source
This commit is contained in:
zab2
2013-10-09 14:08:44 +00:00
parent e69fefda62
commit c8843a736d
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/streaming/java/src/net/i2p/client/streaming/Connection.java
View File

@ -67,7 +67,7 @@ class Connection {
private int _lastCongestionSeenAt; private int _lastCongestionSeenAt;
private long _lastCongestionTime; private long _lastCongestionTime;
private volatile long _lastCongestionHighestUnacked; private volatile long _lastCongestionHighestUnacked;
private boolean _ackSinceCongestion; private final AtomicBoolean _ackSinceCongestion;
/** Notify this on connection (or connection failure) */ /** Notify this on connection (or connection failure) */
private final Object _connectLock; private final Object _connectLock;
/** how many messages have been resent and not yet ACKed? */ /** how many messages have been resent and not yet ACKed? */
@ -143,7 +143,7 @@ class Connection {
_lastCongestionHighestUnacked = -1; _lastCongestionHighestUnacked = -1;
_lastReceivedOn = -1; _lastReceivedOn = -1;
_activityTimer = new ActivityTimer(); _activityTimer = new ActivityTimer();
_ackSinceCongestion = true; _ackSinceCongestion = new AtomicBoolean(true);
_connectLock = new Object(); _connectLock = new Object();
_connectionEvent = new ConEvent(); _connectionEvent = new ConEvent();
_randomWait = _context.random().nextInt(10*1000); // just do this once to reduce usage _randomWait = _context.random().nextInt(10*1000); // just do this once to reduce usage
@ -499,7 +499,7 @@ class Connection {
_outboundPackets.notifyAll(); _outboundPackets.notifyAll();
} }
if ((acked != null) && (!acked.isEmpty()) ) if ((acked != null) && (!acked.isEmpty()) )
_ackSinceCongestion = true; _ackSinceCongestion.set(true);
return acked; return acked;
} }
@ -965,11 +965,10 @@ class Connection {
void congestionOccurred() { void congestionOccurred() {
// if we hit congestion and e.g. 5 packets are resent, // if we hit congestion and e.g. 5 packets are resent,
// dont set the size to (winSize >> 4). only set the // dont set the size to (winSize >> 4). only set the
if (_ackSinceCongestion) { if (_ackSinceCongestion.compareAndSet(true,false)) {
_lastCongestionSeenAt = _options.getWindowSize(); _lastCongestionSeenAt = _options.getWindowSize();
_lastCongestionTime = _context.clock().now(); _lastCongestionTime = _context.clock().now();
_lastCongestionHighestUnacked = _lastSendId.get(); _lastCongestionHighestUnacked = _lastSendId.get();
_ackSinceCongestion = false;
} }
} }
@ -1330,7 +1329,7 @@ class Connection {
int newWindowSize = getOptions().getWindowSize(); int newWindowSize = getOptions().getWindowSize();
if (_ackSinceCongestion) { if (_ackSinceCongestion.get()) {
// only shrink the window once per window // only shrink the window once per window
if (_packet.getSequenceNum() > _lastCongestionHighestUnacked) { if (_packet.getSequenceNum() > _lastCongestionHighestUnacked) {
congestionOccurred(); congestionOccurred();