I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

propagate from branch 'i2p.i2p.zzz.test' (head ef7e2c611e0eaa2f92b31c0b364d39ec023eb135)

Browse Source 
to branch 'i2p.i2p' (head 928500dd1439f4cf359ea90cb5349bfaa7d2194b)
This commit is contained in:
zzz
2009-04-02 22:07:48 +00:00
parent d2fc397295 1aa7fbbba0
commit 8c4800309e
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
router/java/src/net/i2p/router/RouterContext.java
View File

@ -12,7 +12,6 @@ import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade;
import net.i2p.router.peermanager.Calculator; import net.i2p.router.peermanager.Calculator;
import net.i2p.router.peermanager.CapacityCalculator; import net.i2p.router.peermanager.CapacityCalculator;
import net.i2p.router.peermanager.IntegrationCalculator; import net.i2p.router.peermanager.IntegrationCalculator;
import net.i2p.router.peermanager.IsFailingCalculator;
import net.i2p.router.peermanager.PeerManagerFacadeImpl; import net.i2p.router.peermanager.PeerManagerFacadeImpl;
import net.i2p.router.peermanager.ProfileManagerImpl; import net.i2p.router.peermanager.ProfileManagerImpl;
import net.i2p.router.peermanager.ProfileOrganizer; import net.i2p.router.peermanager.ProfileOrganizer;
@ -60,7 +59,6 @@ public class RouterContext extends I2PAppContext {
private MessageStateMonitor _messageStateMonitor; private MessageStateMonitor _messageStateMonitor;
private RouterThrottle _throttle; private RouterThrottle _throttle;
private RouterClock _clock; private RouterClock _clock;
private Calculator _isFailingCalc;
private Calculator _integrationCalc; private Calculator _integrationCalc;
private Calculator _speedCalc; private Calculator _speedCalc;
private Calculator _capacityCalc; private Calculator _capacityCalc;
@ -128,7 +126,6 @@ public class RouterContext extends I2PAppContext {
_messageValidator = new MessageValidator(this); _messageValidator = new MessageValidator(this);
//_throttle = new RouterThrottleImpl(this); //_throttle = new RouterThrottleImpl(this);
_throttle = new RouterDoSThrottle(this); _throttle = new RouterDoSThrottle(this);
_isFailingCalc = new IsFailingCalculator(this);
_integrationCalc = new IntegrationCalculator(this); _integrationCalc = new IntegrationCalculator(this);
_speedCalc = new SpeedCalculator(this); _speedCalc = new SpeedCalculator(this);
_capacityCalc = new CapacityCalculator(this); _capacityCalc = new CapacityCalculator(this);
@ -258,8 +255,6 @@ public class RouterContext extends I2PAppContext {
*/ */
public RouterThrottle throttle() { return _throttle; } public RouterThrottle throttle() { return _throttle; }
/** how do we rank the failure of profiles? */
public Calculator isFailingCalculator() { return _isFailingCalc; }
/** how do we rank the integration of profiles? */ /** how do we rank the integration of profiles? */
public Calculator integrationCalculator() { return _integrationCalc; } public Calculator integrationCalculator() { return _integrationCalc; }
/** how do we rank the speed of profiles? */ /** how do we rank the speed of profiles? */
@ -289,7 +284,6 @@ public class RouterContext extends I2PAppContext {
buf.append(_statPublisher).append('\n'); buf.append(_statPublisher).append('\n');
buf.append(_shitlist).append('\n'); buf.append(_shitlist).append('\n');
buf.append(_messageValidator).append('\n'); buf.append(_messageValidator).append('\n');
buf.append(_isFailingCalc).append('\n');
buf.append(_integrationCalc).append('\n'); buf.append(_integrationCalc).append('\n');
buf.append(_speedCalc).append('\n'); buf.append(_speedCalc).append('\n');
return buf.toString(); return buf.toString();

2
router/java/src/net/i2p/router/peermanager/PeerProfile.java
View File

@ -442,7 +442,7 @@ public class PeerProfile {
private double calculateSpeed() { return _context.speedCalculator().calc(this); } private double calculateSpeed() { return _context.speedCalculator().calc(this); }
private double calculateCapacity() { return _context.capacityCalculator().calc(this); } private double calculateCapacity() { return _context.capacityCalculator().calc(this); }
private double calculateIntegration() { return _context.integrationCalculator().calc(this); } private double calculateIntegration() { return _context.integrationCalculator().calc(this); }
private boolean calculateIsFailing() { return _context.isFailingCalculator().calcBoolean(this); } private boolean calculateIsFailing() { return false; }
void setIsFailing(boolean val) { _isFailing = val; } void setIsFailing(boolean val) { _isFailing = val; }
public int hashCode() { return (_peer == null ? 0 : _peer.hashCode()); } public int hashCode() { return (_peer == null ? 0 : _peer.hashCode()); }