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

SSU: Remove redundant field (ticket #2659)

Browse Source
This commit is contained in:
zzz
2019-11-15 13:45:58 +00:00
parent 8bb1347e6e
commit 394db0b307
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,10 +235,6 @@ public class PeerState {
This counts full messages, NOT fragments (UDP packets) This counts full messages, NOT fragments (UDP packets)
*/ */
private int _concurrentMessagesAllowed = INIT_CONCURRENT_MSGS; private int _concurrentMessagesAllowed = INIT_CONCURRENT_MSGS;
/**
* how many outbound messages are currently being transmitted. Not thread safe, as we're not strict
*/
private int _concurrentMessagesActive;
/** how many concurrency rejections have we had in a row */ /** how many concurrency rejections have we had in a row */
private int _consecutiveRejections; private int _consecutiveRejections;
/** is it inbound? **/ /** is it inbound? **/
@ -662,10 +658,6 @@ public class PeerState {
int incrementConsecutiveFailedSends() { int incrementConsecutiveFailedSends() {
synchronized(_outboundMessages) { synchronized(_outboundMessages) {
_concurrentMessagesActive--;
if (_concurrentMessagesActive < 0)
_concurrentMessagesActive = 0;
//long now = _context.clock().now()/(10*1000); //long now = _context.clock().now()/(10*1000);
//if (_lastFailedSendPeriod >= now) { //if (_lastFailedSendPeriod >= now) {
// // ignore... too fast // // ignore... too fast
@ -734,15 +726,14 @@ public class PeerState {
if (size <= _sendWindowBytesRemaining || if (size <= _sendWindowBytesRemaining ||
(size > _sendWindowBytes && _sendWindowBytesRemaining >= _sendWindowBytes)) { (size > _sendWindowBytes && _sendWindowBytesRemaining >= _sendWindowBytes)) {
// move this check to getSendWindowBytesRemaining() ? // move this check to getSendWindowBytesRemaining() ?
if ( (messagePushCount == 0) && (_concurrentMessagesActive > _concurrentMessagesAllowed) ) { if (messagePushCount == 0 && _outboundMessages.size() > _concurrentMessagesAllowed) {
_consecutiveRejections++; _consecutiveRejections++;
_context.statManager().addRateData("udp.rejectConcurrentActive", _concurrentMessagesActive, _consecutiveRejections); _context.statManager().addRateData("udp.rejectConcurrentActive", _outboundMessages.size(), _consecutiveRejections);
return false; return false;
} else if (messagePushCount == 0) { } else if (messagePushCount == 0) {
_context.statManager().addRateData("udp.allowConcurrentActive", _concurrentMessagesActive, _concurrentMessagesAllowed); _context.statManager().addRateData("udp.allowConcurrentActive", _outboundMessages.size(), _concurrentMessagesAllowed);
_concurrentMessagesActive++;
if (_consecutiveRejections > 0) if (_consecutiveRejections > 0)
_context.statManager().addRateData("udp.rejectConcurrentSequence", _consecutiveRejections, _concurrentMessagesActive); _context.statManager().addRateData("udp.rejectConcurrentSequence", _consecutiveRejections, _outboundMessages.size());
_consecutiveRejections = 0; _consecutiveRejections = 0;
} }
_sendWindowBytesRemaining -= size; _sendWindowBytesRemaining -= size;
@ -796,7 +787,7 @@ public class PeerState {
*/ */
public int getConcurrentSends() { public int getConcurrentSends() {
synchronized(_outboundMessages) { synchronized(_outboundMessages) {
return _concurrentMessagesActive; return _outboundMessages.size();
} }
} }
@ -1196,10 +1187,6 @@ public class PeerState {
* Caller should synch on this * Caller should synch on this
*/ */
private void locked_messageACKed(int bytesACKed, long lifetime, int numSends) { private void locked_messageACKed(int bytesACKed, long lifetime, int numSends) {
_concurrentMessagesActive--;
if (_concurrentMessagesActive < 0)
_concurrentMessagesActive = 0;
_consecutiveFailedSends = 0; _consecutiveFailedSends = 0;
// _lastFailedSendPeriod = -1; // _lastFailedSendPeriod = -1;
if (numSends < 2) { if (numSends < 2) {