Changeset 77367607


Ignore:
Timestamp:
Aug 27, 2018 6:20:40 AM (2 years ago)
Author:
slumlord <slumlord@…>
Branches:
master
Children:
92cc66e
Parents:
a5830f0
Message:

Revert PeerState?.java temporarily to allow for propagation from i2p.i2p

File:
1 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/transport/udp/PeerState.java

    ra5830f0 r77367607  
    1212import java.util.Queue;
    1313import java.util.concurrent.LinkedBlockingQueue;
     14import java.util.concurrent.atomic.AtomicInteger;
    1415
    1516import net.i2p.data.Hash;
     
    1718import net.i2p.router.OutNetMessage;
    1819import net.i2p.router.RouterContext;
    19 import net.i2p.router.util.CachedIteratorCollection;
     20import net.i2p.router.util.CachedIteratorArrayList;
     21import net.i2p.router.util.CoDelPriorityBlockingQueue;
    2022import net.i2p.router.util.PriBlockingQueue;
    2123import net.i2p.util.Log;
     
    209211     *  although there could be some that have not been sent yet.
    210212     */
    211     private final CachedIteratorCollection<OutboundMessageState> _outboundMessages;
     213    private final List<OutboundMessageState> _outboundMessages;
    212214
    213215    /**
     
    369371        _rttDeviation = _rtt;
    370372        _inboundMessages = new HashMap<Long, InboundMessageState>(8);
    371         _outboundMessages = new CachedIteratorCollection<OutboundMessageState>();
     373        _outboundMessages = new CachedIteratorArrayList<OutboundMessageState>(32);
    372374        //_outboundQueue = new CoDelPriorityBlockingQueue(ctx, "UDP-PeerState", 32);
    373375        _outboundQueue = new PriBlockingQueue<OutboundMessageState>(ctx, "UDP-PeerState", 32);
     
    15671569            dropOutbound();
    15681570            return 0;
    1569         }
     1571        }
    15701572
    15711573        int rv = 0;
     
    15851587                    if (_retransmitter == state)
    15861588                        _retransmitter = null;
    1587                     _log.debug("CachedIteratorCollection: sendFailed update" + state);
    15881589                    _context.statManager().addRateData("udp.sendFailed", state.getPushCount());
    15891590                    if (failed == null) failed = new ArrayList<OutboundMessageState>(4);
     
    15931594                    if (state == _retransmitter)
    15941595                        _retransmitter = null;
    1595                     _log.debug("CachedIteratorCollection: sendAggressiveFailed update" + state);
    15961596                    _context.statManager().addRateData("udp.sendAggressiveFailed", state.getPushCount());
    15971597                    if (failed == null) failed = new ArrayList<OutboundMessageState>(4);
     
    19051905            _context.statManager().addRateData("udp.sendConfirmVolley", numSends);
    19061906            _transport.succeeded(state);
    1907             int numFragments = state.getFragmentCount();
    19081907            // this adjusts the rtt/rto/window/etc
    19091908            messageACKed(state.getMessageSize(), state.getLifetime(), numSends);
Note: See TracChangeset for help on using the changeset viewer.