Changeset 1bbd2cf


Ignore:
Timestamp:
Mar 3, 2007 8:11:05 PM (14 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
a5c4ba3
Parents:
ce50efa6
git-author:
zzz <zzz> (03/03/07 20:11:05)
git-committer:
zzz <zzz@…> (03/03/07 20:11:05)
Message:

2007-03-03 zzz

  • Implement priority sending for NTCP
  • Disable trimForOverload() in tunnel BuildExecutor? which was preventing tunnel builds when outbound traffic was high (i.e. most of the time when running i2psnark)
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    rce50efa6 r1bbd2cf  
    1 $Id: history.txt,v 1.552 2007-02-28 21:22:16 zzz Exp $
     1$Id: history.txt,v 1.553 2007-02-28 21:29:12 zzz Exp $
     2
     32007-03-03  zzz
     4    * Implement priority sending for NTCP
     5    * Disable trimForOverload() in tunnel BuildExecutor which
     6      was preventing tunnel builds when outbound traffic was high
     7      (i.e. most of the time when running i2psnark)
    28
    392007-02-28  zzz
  • router/java/src/net/i2p/router/RouterVersion.java

    rce50efa6 r1bbd2cf  
    1616 */
    1717public class RouterVersion {
    18     public final static String ID = "$Revision: 1.488 $ $Date: 2007-02-28 21:22:14 $";
     18    public final static String ID = "$Revision: 1.489 $ $Date: 2007-02-28 21:29:11 $";
    1919    public final static String VERSION = "0.6.1.27";
    20     public final static long BUILD = 2;
     20    public final static long BUILD = 3;
    2121    public static void main(String args[]) {
    2222        System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
  • router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java

    rce50efa6 r1bbd2cf  
    583583            }
    584584                //throw new RuntimeException("We should not be preparing a write while we still have one pending");
    585             if (_outbound.size() > 0) {
     585            if (queueTime() > 3*1000) {  // don't stall low-priority messages
    586586                msg = (OutNetMessage)_outbound.remove(0);
    587                 _currentOutbound = msg;
    588587            } else {
    589                 return;
    590             }
     588                Iterator it = _outbound.iterator();
     589                for (int i = 0; it.hasNext() && i < 75; i++) {  //arbitrary bound
     590                    OutNetMessage mmsg = (OutNetMessage) it.next();
     591                    if (msg == null || mmsg.getPriority() > msg.getPriority())
     592                        msg = mmsg;
     593                }
     594                if (msg == null)
     595                    return;
     596                // if (_outbound.indexOf(msg) > 0)
     597                //     _log.debug("Priority message sent, pri = " + msg.getPriority() + " pos = " + _outbound.indexOf(msg) + "/" +_outbound.size());
     598                _outbound.remove(msg);
     599            }
     600            _currentOutbound = msg;
    591601        }
    592602       
  • router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java

    rce50efa6 r1bbd2cf  
    157157        // Trim the number of allowed tunnels for overload,
    158158        // initiate a tunnel drop on severe overload
    159         allowed = trimForOverload(allowed,concurrent);
     159        // tunnel building is high priority, don't do this
     160        // allowed = trimForOverload(allowed,concurrent);
    160161
    161162        return allowed;
     
    169170     * Don't even try to build tunnels if we're saturated
    170171     */
     172/*
    171173    private int trimForOverload(int allowed, int concurrent) {
    172174
     
    222224        return(allowed);
    223225    }
    224 
     226*/
    225227
    226228    public void run() {
Note: See TracChangeset for help on using the changeset viewer.