echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doing something different this time -- but only to core

Browse Source 
I marked all the empty statements with //nop
I removed unneccessary elses (ie, the if returns or throws)
I took out some casts (integral promotions/some didn't need to be there)
-- Love, shendaras
(2 in one day, w00t)
This commit is contained in:
shendaras
2004-07-31 01:04:34 +00:00
committed by zzz
parent 48556de92b
commit d10dc1e8d3
64 changed files with 327 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/src/net/i2p/stat/Frequency.java
View File

@ -55,20 +55,18 @@ public class Frequency {
/** calculate how many events would occur in a period given the current average */
public double getAverageEventsPerPeriod() {
synchronized (_lock) {
if (_avgInterval > 0)
return _period / _avgInterval;
else
return 0;
if (_avgInterval > 0) return _period / _avgInterval;
return 0;
}
}
/** calculate how many events would occur in a period given the maximum average */
public double getMaxAverageEventsPerPeriod() {
synchronized (_lock) {
if (_minAverageInterval > 0)
return _period / _minAverageInterval;
else
return 0;
if (_minAverageInterval > 0) return _period / _minAverageInterval;
return 0;
}
}
@ -76,10 +74,9 @@ public class Frequency {
public double getStrictAverageInterval() {
synchronized (_lock) {
long duration = now() - _start;
if ((duration <= 0) || (_count <= 0))
return 0;
else
return duration / _count;
if ((duration <= 0) || (_count <= 0)) return 0;
return duration / _count;
}
}
@ -87,10 +84,9 @@ public class Frequency {
public double getStrictAverageEventsPerPeriod() {
double avgInterval = getStrictAverageInterval();
synchronized (_lock) {
if (avgInterval > 0)
return _period / avgInterval;
else
return 0;
if (avgInterval > 0) return _period / avgInterval;
return 0;
}
}

102
core/java/src/net/i2p/stat/Rate.java
View File

@ -182,27 +182,26 @@ public class Rate {
if (measuredPeriod < _period) {
// no need to coallesce
return;
} else {
// ok ok, lets coallesce
// how much were we off by? (so that we can sample down the measured values)
double periodFactor = measuredPeriod / _period;
_lastTotalValue = (_currentTotalValue == 0 ? 0.0d : _currentTotalValue / periodFactor);
_lastEventCount = (_currentEventCount == 0 ? 0l : (long) (_currentEventCount / periodFactor));
_lastTotalEventTime = (_currentTotalEventTime == 0 ? 0l
: (long) (_currentTotalEventTime / periodFactor));
_lastCoallesceDate = now;
if (_lastTotalValue > _extremeTotalValue) {
_extremeTotalValue = _lastTotalValue;
_extremeEventCount = _lastEventCount;
_extremeTotalEventTime = _lastTotalEventTime;
}
_currentTotalValue = 0.0d;
_currentEventCount = 0;
_currentTotalEventTime = 0;
}
// ok ok, lets coallesce
// how much were we off by? (so that we can sample down the measured values)
double periodFactor = measuredPeriod / _period;
_lastTotalValue = (_currentTotalValue == 0 ? 0.0D : _currentTotalValue / periodFactor);
_lastEventCount = (_currentEventCount == 0 ? 0L : (long) (_currentEventCount / periodFactor));
_lastTotalEventTime = (_currentTotalEventTime == 0 ? 0L : (long) (_currentTotalEventTime / periodFactor));
_lastCoallesceDate = now;
if (_lastTotalValue > _extremeTotalValue) {
_extremeTotalValue = _lastTotalValue;
_extremeEventCount = _lastEventCount;
_extremeTotalEventTime = _lastTotalEventTime;
}
_currentTotalValue = 0.0D;
_currentEventCount = 0;
_currentTotalEventTime = 0;
}
}
@ -210,24 +209,24 @@ public class Rate {
public double getAverageValue() {
if ((_lastTotalValue != 0) && (_lastEventCount > 0))
return _lastTotalValue / _lastEventCount;
else
return 0.0d;
return 0.0D;
}
/** what was the average value across the events in the most active period? */
public double getExtremeAverageValue() {
if ((_extremeTotalValue != 0) && (_extremeEventCount > 0))
return _extremeTotalValue / _extremeEventCount;
else
return 0.0d;
return 0.0D;
}
/** what was the average value across the events since the stat was created? */
public double getLifetimeAverageValue() {
if ((_lifetimeTotalValue != 0) && (_lifetimeEventCount > 0))
return _lifetimeTotalValue / _lifetimeEventCount;
else
return 0.0d;
return 0.0D;
}
/**
@ -239,12 +238,12 @@ public class Rate {
public double getLastEventSaturation() {
if ((_lastEventCount > 0) && (_lastTotalEventTime > 0)) {
double eventTime = (double) _lastTotalEventTime / (double) _lastEventCount;
double maxEvents = (double) _period / eventTime;
double maxEvents = _period / eventTime;
double saturation = _lastEventCount / maxEvents;
return saturation;
} else {
return 0.0d;
}
return 0.0D;
}
/**
@ -256,11 +255,10 @@ public class Rate {
public double getExtremeEventSaturation() {
if ((_extremeEventCount > 0) && (_extremeTotalEventTime > 0)) {
double eventTime = (double) _extremeTotalEventTime / (double) _extremeEventCount;
double maxEvents = (double) _period / eventTime;
double maxEvents = _period / eventTime;
return _extremeEventCount / maxEvents;
} else {
return 0.0d;
}
return 0.0D;
}
/**
@ -272,13 +270,12 @@ public class Rate {
public double getLifetimeEventSaturation() {
if ((_lastEventCount > 0) && (_lifetimeTotalEventTime > 0)) {
double eventTime = (double) _lifetimeTotalEventTime / (double) _lifetimeEventCount;
double maxEvents = (double) _period / eventTime;
double maxEvents = _period / eventTime;
double numPeriods = getLifetimePeriods();
double avgEventsPerPeriod = _lifetimeEventCount / numPeriods;
return avgEventsPerPeriod / maxEvents;
} else {
return 0.0d;
}
return 0.0D;
}
/** how many periods have we already completed? */
@ -297,13 +294,11 @@ public class Rate {
public double getLastSaturationLimit() {
if ((_lastTotalValue != 0) && (_lastEventCount > 0) && (_lastTotalEventTime > 0)) {
double saturation = getLastEventSaturation();
if (saturation != 0.0d)
return _lastTotalValue / saturation;
else
return 0.0d;
} else {
return 0.0d;
if (saturation != 0.0D) return _lastTotalValue / saturation;
return 0.0D;
}
return 0.0D;
}
/**
@ -315,13 +310,12 @@ public class Rate {
public double getExtremeSaturationLimit() {
if ((_extremeTotalValue != 0) && (_extremeEventCount > 0) && (_extremeTotalEventTime > 0)) {
double saturation = getExtremeEventSaturation();
if (saturation != 0.0d)
return _extremeTotalValue / saturation;
else
return 0.0d;
} else {
return 0.0d;
}
if (saturation != 0.0d) return _extremeTotalValue / saturation;
return 0.0D;
}
return 0.0D;
}
/**
@ -331,8 +325,8 @@ public class Rate {
public double getPercentageOfExtremeValue() {
if ((_lastTotalValue != 0) && (_extremeTotalValue != 0))
return _lastTotalValue / _extremeTotalValue;
else
return 0.0d;
return 0.0D;
}
/**
@ -343,9 +337,9 @@ public class Rate {
if ((_lastTotalValue != 0) && (_lifetimeTotalValue != 0)) {
double lifetimePeriodValue = _period * (_lifetimeTotalValue / (now() - _creationDate));
return _lastTotalValue / lifetimePeriodValue;
} else {
return 0.0d;
}
return 0.0D;
}
public void store(String prefix, StringBuffer buf) throws IOException {
@ -468,7 +462,7 @@ public class Rate {
for (int i = 0; i < 50; i++) {
try {
Thread.sleep(20);
} catch (InterruptedException ie) {
} catch (InterruptedException ie) { // nop
}
rate.addData(i * 100, 20);
}
@ -492,7 +486,7 @@ public class Rate {
}
try {
Thread.sleep(5000);
} catch (InterruptedException ie) {
} catch (InterruptedException ie) { // nop
}
}
}

10
core/java/src/net/i2p/stat/RateStat.java
View File

@ -97,9 +97,9 @@ public class RateStat {
for (int i = 0; i < _rates.length; i++)
if (!_rates[i].equals(rs.getRate(_rates[i].getPeriod()))) return false;
return true;
} else {
return false;
}
}
return false;
}
public void store(OutputStream out, String prefix) throws IOException {
@ -158,7 +158,7 @@ public class RateStat {
for (int i = 0; i < 50; i++) {
try {
Thread.sleep(20);
} catch (InterruptedException ie) {
} catch (InterruptedException ie) { // nop
}
rs.addData(i * 100, 20);
}
@ -185,7 +185,7 @@ public class RateStat {
}
try {
Thread.sleep(5000);
} catch (InterruptedException ie) {
} catch (InterruptedException ie) { // nop
}
}
}