foil evil typo plot

This commit is contained in:
duck
2004-10-18 23:37:49 +00:00
committed by zzz
parent a95a968fa8
commit 81e0a145f1
17 changed files with 91 additions and 91 deletions

View File

@ -206,11 +206,11 @@ public class NetMonitor {
}
/** drop all the old summary data */
public void coallesceData() {
public void coalesceData() {
synchronized (_peerSummaries) {
for (Iterator iter = _peerSummaries.values().iterator(); iter.hasNext(); ) {
PeerSummary summary = (PeerSummary)iter.next();
summary.coallesceData(_summaryDurationHours * 60*60*1000);
summary.coalesceData(_summaryDurationHours * 60*60*1000);
}
}
}

View File

@ -44,7 +44,7 @@ class NetMonitorRunner implements Runnable {
long nextExport = now + _monitor.getExportDelay() * 1000;
while (_monitor.isRunning()) {
now = Clock.getInstance().now();
_monitor.coallesceData();
_monitor.coalesceData();
if (now >= nextHarvest) {
runHarvest();
nextHarvest = now + _monitor.getHarvestDelay() * 1000;

View File

@ -22,7 +22,7 @@ public class PeerSummary {
/** statName to a List of PeerStat elements (sorted by sample date, earliest first) */
private Map _stats;
/** lock on this when accessing stat data */
private Object _coallesceLock = new Object();
private Object _coalesceLock = new Object();
public PeerSummary(String peer) {
_peer = peer;
@ -38,7 +38,7 @@ public class PeerSummary {
* @param val actual data harvested
*/
public void addData(String stat, String description, String valueDescriptions[], long when, double val[]) {
synchronized (_coallesceLock) {
synchronized (_coalesceLock) {
TreeMap stats = locked_getData(stat);
stats.put(new Long(when), new PeerStat(stat, description, valueDescriptions, when, val));
}
@ -53,7 +53,7 @@ public class PeerSummary {
* @param val actual data harvested
*/
public void addData(String stat, String description, String valueDescriptions[], long when, long val[]) {
synchronized (_coallesceLock) {
synchronized (_coalesceLock) {
TreeMap stats = locked_getData(stat);
stats.put(new Long(when), new PeerStat(stat, description, valueDescriptions, when, val));
}
@ -68,7 +68,7 @@ public class PeerSummary {
*
*/
public List getData(String statName) {
synchronized (_coallesceLock) {
synchronized (_coalesceLock) {
return new ArrayList(((TreeMap)_stats.get(statName)).values());
}
}
@ -78,21 +78,21 @@ public class PeerSummary {
*
*/
public Set getStatNames() {
synchronized (_coallesceLock) {
synchronized (_coalesceLock) {
return new HashSet(_stats.keySet());
}
}
/** drop old data points */
public void coallesceData(long summaryDurationMs) {
public void coalesceData(long summaryDurationMs) {
long earliest = Clock.getInstance().now() - summaryDurationMs;
synchronized (_coallesceLock) {
locked_coallesce(earliest);
synchronized (_coalesceLock) {
locked_coalesce(earliest);
}
}
/** go through all the stats and remove ones from before the given date */
private void locked_coallesce(long earliestSampleDate) {
private void locked_coalesce(long earliestSampleDate) {
if (true) return;
for (Iterator iter = _stats.keySet().iterator(); iter.hasNext(); ) {
String statName = (String)iter.next();
@ -116,4 +116,4 @@ public class PeerSummary {
_stats.put(statName, new TreeMap());
return (TreeMap)_stats.get(statName);
}
}
}

View File

@ -87,7 +87,7 @@ class PeerSummaryReader {
}
if (summary == null)
return;
summary.coallesceData(monitor.getSummaryDurationHours() * 60*60*1000);
summary.coalesceData(monitor.getSummaryDurationHours() * 60*60*1000);
monitor.addSummary(summary);
}
@ -103,4 +103,4 @@ class PeerSummaryReader {
return _fmt.parse(when).getTime();
}
}
}
}