Changeset 5401721


Ignore:
Timestamp:
Sep 12, 2011 1:11:57 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
61831b1
Parents:
1664072
Message:

cleanups and comments

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    r1664072 r5401721  
     12011-09-12 zzz
     2  * Build Executor:
     3    - Limit max parallel builds on really slow machines (ticket #519)
     4    - Slow down build loop when network is apparently disconnected (ticket #519)
     5  * NetDB: Disable floodfill at shutdown time if enabled
     6
    172011-09-09 zzz
    28  * TunnelDispatcher: Fix bug in -13 preventing participating
  • router/java/src/net/i2p/router/JobQueue.java

    r1664072 r5401721  
    2727
    2828import net.i2p.data.DataHelper;
    29 import net.i2p.router.networkdb.HandleDatabaseLookupMessageJob;
     29import net.i2p.router.networkdb.kademlia.HandleFloodfillDatabaseLookupMessageJob;
    3030import net.i2p.util.Clock;
    3131import net.i2p.util.I2PThread;
     
    176176            }
    177177
    178             if (shouldDrop(job, numReady)) {
     178            if ((!alreadyExists) && shouldDrop(job, numReady)) {
    179179                job.dropped();
    180180                dropped = true;
     
    257257        if (_maxWaitingJobs <= 0) return false; // dont ever drop jobs
    258258        if (!_allowParallelOperation) return false; // dont drop during startup [duh]
    259         Class cls = job.getClass();
    260259        if (numReady > _maxWaitingJobs) {
     260            Class cls = job.getClass();
    261261            // lets not try to drop too many tunnel messages...
    262262            //if (cls == HandleTunnelMessageJob.class)
     
    264264               
    265265            // we don't really *need* to answer DB lookup messages
    266             if (cls == HandleDatabaseLookupMessageJob.class)
     266            // This is pretty lame, there's actually a ton of different jobs we
     267            // could drop, but is it worth making a list?
     268            if (cls == HandleFloodfillDatabaseLookupMessageJob.class)
    267269                return true;
    268270
     
    476478                                    // _timedJobs is now a TreeSet, so once we hit one that is
    477479                                    // not ready yet, we can break
     480                                    // NOTE: By not going through the whole thing, a single job changing
     481                                    // setStartAfter() to some far-away time, without
     482                                    // calling addJob(), could clog the whole queue forever.
     483                                    // Hopefully nobody does that, and as a backup, we hope
     484                                    // that the TreeSet will eventually resort it from other addJob() calls.
    478485                                        timeToWait = timeLeft;
    479486                                        break;
     
    655662     */
    656663    public int getJobs(Collection<Job> readyJobs, Collection<Job> timedJobs,
    657                         Collection<Job> activeJobs, Collection<Job> justFinishedJobs) {
     664                       Collection<Job> activeJobs, Collection<Job> justFinishedJobs) {
    658665        for (JobQueueRunner runner :_queueRunners.values()) {
    659666            Job job = runner.getCurrentJob();
  • router/java/src/net/i2p/router/RouterVersion.java

    r1664072 r5401721  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 15;
     21    public final static long BUILD = 16;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java

    r1664072 r5401721  
    1111
    1212/**
    13  *
     13 *  Data about a tunnel we created
    1414 */
    1515class PooledTunnelCreatorConfig extends TunnelCreatorConfig {
     
    2929    }
    3030   
    31     // calls TestJob
     31    /** calls TestJob */
    3232    @Override
    3333    public void testSuccessful(int ms) {
     
    3838    }
    3939   
    40     // called from TestJob
     40    /** called from TestJob */
    4141    public void testJobSuccessful(int ms) {
    4242        super.testSuccessful(ms);
Note: See TracChangeset for help on using the changeset viewer.