Changeset d84b0e44 for router


Ignore:
Timestamp:
Jun 11, 2016 1:47:12 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
16a52951
Parents:
471ff5b9 (diff), bb8e0504 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p.zzz.test2' (head ee7dbea07e8ad7e01cb8012a1540aca8346ee7d2)

to branch 'i2p.i2p' (head 2cb447c64ae706c6cead619c9428083fce6f1d46)

Location:
router/java/src/net/i2p/router
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/StatisticsManager.java

    r471ff5b9 rd84b0e44  
    7272        Properties stats = new Properties();
    7373        stats.setProperty("router.version", RouterVersion.VERSION);
    74         // scheduled for removal, never used
    75         if (CoreVersion.VERSION.equals("0.9.23"))
    76             stats.setProperty("coreVersion", CoreVersion.VERSION);
     74        // never used
     75        //stats.setProperty("coreVersion", CoreVersion.VERSION);
    7776        stats.setProperty(RouterInfo.PROP_NETWORK_ID, _networkID);
    7877        stats.setProperty(RouterInfo.PROP_CAPABILITIES, _context.router().getCapabilities());
     
    169168
    170169        // So that we will still get build requests - not required since 0.7.9 2010-01-12
    171         // scheduled for removal
    172         if (CoreVersion.VERSION.equals("0.9.23"))
    173             stats.setProperty("stat_uptime", "90m");
     170        //stats.setProperty("stat_uptime", "90m");
    174171        if (FloodfillNetworkDatabaseFacade.isFloodfill(_context.router().getRouterInfo())) {
    175172            int ri = _context.router().getUptime() > 30*60*1000 ?
  • router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java

    r471ff5b9 rd84b0e44  
    233233            if (_dead) return;
    234234            _dead = true;
     235            super.success();
    235236        }
    236237        if (_log.shouldLog(Log.INFO))
  • router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java

    r471ff5b9 rd84b0e44  
    3434    protected volatile boolean _dead;
    3535    protected final long _created;
     36    protected boolean _success;
    3637
    3738    /**
     
    7071     */
    7172    void addDeferred(Job onFind, Job onFailed, long timeoutMs, boolean isLease) {
     73        boolean success;
    7274        synchronized (this) {
    7375            if (!_dead) {
     
    7880                return;
    7981            }
     82            success = _success;
    8083        }
    8184        // outside synch to avoid deadlock with job queue
    82         getContext().jobQueue().addJob(onFailed);
     85        if (success && onFind != null)
     86            getContext().jobQueue().addJob(onFind);
     87        else if (!success && onFailed != null)
     88            getContext().jobQueue().addJob(onFailed);
    8389    }
    8490
     
    194200     */
    195201    void success() {
     202        synchronized(this) {
     203            _success = true;
     204        }
     205/****
    196206        throw new UnsupportedOperationException("use override");
    197 /****
    198207        if (_dead) return;
    199208        if (_log.shouldLog(Log.INFO))
  • router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java

    r471ff5b9 rd84b0e44  
    588588            if (_dead) return;
    589589            _dead = true;
     590            _success = true;
    590591            tries = _unheardFrom.size() + _failedPeers.size();
    591592            if (_unheardFrom.size() == 1) {
Note: See TracChangeset for help on using the changeset viewer.