better loading from cache

This commit is contained in:
zab2
2013-07-18 01:52:46 +00:00
parent 1e2fb4bea5
commit 018098b8ef
2 changed files with 9 additions and 11 deletions

View File

@@ -572,21 +572,23 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
/** used in TCB @since 0.9.8 */ /** used in TCB @since 0.9.8 */
int getRTTDev() { return _rttDev; } int getRTTDev() { return _rttDev; }
/** used in TCB @since 0.9.8 */ private void setRTTDev(int rttDev) { _rttDev = rttDev; }
void setRTTDev(int rttDev) { _rttDev = rttDev; }
/** /**
* mark these options as loaded from cache. * Loads options from TCB cache.
* affects the calculation of RTO
*/ */
synchronized void loadedFromCache() { synchronized void loadFromCache(int rtt, int rttDev, int wdw) {
_initState = AckInit.STEADY; _initState = AckInit.STEADY;
setRTT(rtt);
setRTTDev(rttDev);
setWindowSize(wdw);
computeRTO();
} }
/** /**
* computes RTO based on formula in RFC * computes RTO based on formula in RFC
*/ */
synchronized void computeRTO() { private synchronized void computeRTO() {
switch(_initState) { switch(_initState) {
case INIT : case INIT :
throw new IllegalStateException(); throw new IllegalStateException();

View File

@@ -99,11 +99,7 @@ class TCBShare {
" RTTDev: "+ rttDev + " RTTDev: "+ rttDev +
" wdw: " + wdw ); " wdw: " + wdw );
} }
opts.loadedFromCache(); opts.loadFromCache(rtt,rttDev,wdw);
opts.setRTT(rtt);
opts.setRTTDev(rttDev);
opts.setWindowSize(wdw);
opts.computeRTO();
} }
/** store to cache */ /** store to cache */