From 19c2d4767caed2eb20b4dfbbd1940431580cf94d Mon Sep 17 00:00:00 2001 From: chenzo Date: Fri, 5 Oct 2012 16:05:17 +0000 Subject: [PATCH] Improves harvesting time stats: 1) number of harvests and 2) total harvesting time for each harvesters. --- src/org/ice4j/ice/Agent.java | 102 +++++++++++------- .../ice4j/ice/harvest/CandidateHarvester.java | 61 +++-------- .../ice/harvest/CandidateHarvesterSet.java | 1 - .../ice/harvest/HostCandidateHarvester.java | 48 +++------ 4 files changed, 96 insertions(+), 116 deletions(-) diff --git a/src/org/ice4j/ice/Agent.java b/src/org/ice4j/ice/Agent.java index 20ed32b..8192151 100644 --- a/src/org/ice4j/ice/Agent.java +++ b/src/org/ice4j/ice/Agent.java @@ -90,16 +90,9 @@ public class Agent = new CandidateHarvesterSet(); /** - * The last harvest start time. -1 if this agent is not currently - * harvesting. + * Manages statisics about harvesting time. */ - private long lastStartHarvestingTime = -1; - - /** - * The last ended harvesting time. -1 if this agent has never harvested yet. - */ - private long lastHarvestingTime = -1; - + private HarvestingTimeStat harvestingTimeStat = new HarvestingTimeStat(); /** * We use the FoundationsRegistry to keep track of the foundations @@ -2199,8 +2192,8 @@ public class Agent * @param harvesterName The class name if the harvester. * * @return The harvesting time (in ms) for the harvester given in parameter. - * -1 if this harvester does not exists, or if the - * agent has not yet harvested with this harvester. + * 0 if this harvester does not exists, or if the agent has not yet + * harvested with this harvester. */ public long getHarvestingTime(String harvesterName) { @@ -2210,7 +2203,7 @@ public class Agent return this.hostCandidateHarvester.getHarvestingTime(); } - long harvestingTime = -1; + long harvestingTime = 0; CandidateHarvester tmpHarvester; Iterator itHarvesters = this.harvesters.iterator(); while(itHarvesters.hasNext()) @@ -2219,16 +2212,54 @@ public class Agent if(tmpHarvester.getClass().getName().endsWith(harvesterName)) { harvestingTime = tmpHarvester.getHarvestingTime(); - // Theremay be several harvester with the same class name. Thus, - // returns only an active one. - if(harvestingTime != -1) + // There may be several harvester with the same class name. + // Thus, returns only an active one (if any). + if(harvestingTime != 0) { return harvestingTime; } } } - return -1; + return 0; + } + + /** + * Returns the number of harvesting time for the harvester given in + * parameter. + * + * @param harvesterName The class name if the harvester. + * + * @return The number of harvesting time for the harvester given in + * parameter. + */ + public int getNbHarvesting(String harvesterName) + { + if(this.hostCandidateHarvester.getClass().getName().endsWith( + harvesterName)) + { + return this.hostCandidateHarvester.getNbHarvesting(); + } + + int nbHarvesting = 0; + CandidateHarvester tmpHarvester; + Iterator itHarvesters = this.harvesters.iterator(); + while(itHarvesters.hasNext()) + { + tmpHarvester = itHarvesters.next(); + if(tmpHarvester.getClass().getName().endsWith(harvesterName)) + { + nbHarvesting = tmpHarvester.getNbHarvesting(); + // There may be several harvester with the same class name. + // Thus, returns only an active one (if any). + if(nbHarvesting != 0) + { + return nbHarvesting; + } + } + } + + return 0; } /** @@ -2236,10 +2267,7 @@ public class Agent */ public void startHarvesting() { - // Remember the start date of this harvester. - this.lastStartHarvestingTime = System.currentTimeMillis(); - // Reset the last harvesting time. - this.lastHarvestingTime = -1; + this.harvestingTimeStat.startHarvesting(); } /** @@ -2247,36 +2275,30 @@ public class Agent */ public void stopHarvesting() { - // Remember the last harvesting time. - this.lastHarvestingTime = this.getTotalHarvestingTime(); - // Stops the current timer. - this.lastStartHarvestingTime = -1; + this.harvestingTimeStat.stopHarvesting(); } /** * Returns the current harvesting time in ms. If this agent is not currently * harvesting, then returns the value of the last total harvesting time for - * all the harvesters. -1 if this agent has nerver harvested. + * all the harvesters. 0 if this agent has nerver harvested. * * @return The current harvesting time in ms. If this agent is not currently * harvesting, then returns the value of the last total harvesting time for - * all the harvesters. -1 if this agent has nerver harvested. + * all the harvesters. 0 if this agent has nerver harvested. */ public long getTotalHarvestingTime() { - if(this.lastStartHarvestingTime != -1) - { - long currentHarvestingTime - = System.currentTimeMillis() - lastStartHarvestingTime; - // Retest here, while the harvesting may be end while computing the - // harvsting time. - if(this.lastStartHarvestingTime != -1) - { - return currentHarvestingTime; - } - } - // If we are ont currently harvesting, then returns the value of the - // last harvesting time. - return this.lastHarvestingTime; + return this.harvestingTimeStat.getHarvestingTime(); + } + + /** + * Returns the number of harvesting for this agent. + * + * @return The number of harvesting for this agent. + */ + public int getNbHarvesting() + { + return this.harvestingTimeStat.getNbHarvesting(); } } diff --git a/src/org/ice4j/ice/harvest/CandidateHarvester.java b/src/org/ice4j/ice/harvest/CandidateHarvester.java index 1c3adab..04c3d47 100644 --- a/src/org/ice4j/ice/harvest/CandidateHarvester.java +++ b/src/org/ice4j/ice/harvest/CandidateHarvester.java @@ -22,16 +22,9 @@ import org.ice4j.ice.*; public abstract class CandidateHarvester { /** - * The last harvest start time for this harvester. -1 if this harvester is - * not currently harvesting. + * Manages statisics about harvesting time. */ - private long lastStartHarvestingTime = -1; - - /** - * The last ended harvesting time for this harvester. -1 if this harvester - * has never harvested yet. - */ - private long lastHarvestingTime = -1; + private HarvestingTimeStat harvestingTimeStat = new HarvestingTimeStat(); /** * Gathers all candidate addresses of the type that this @@ -56,10 +49,7 @@ public abstract class CandidateHarvester */ public void startHarvesting() { - // Remember the start date of this harvester. - this.lastStartHarvestingTime = System.currentTimeMillis(); - // Reset the last harvesting time. - this.lastHarvestingTime = -1; + this.harvestingTimeStat.startHarvesting(); } /** @@ -67,47 +57,30 @@ public abstract class CandidateHarvester */ public void stopHarvesting() { - // Remember the last harvesting time. - this.lastHarvestingTime = this.getHarvestingTime(); - // Stops the current timer. - this.lastStartHarvestingTime = -1; - } - - /** - * Disabless the harvesting timer. Called when the harvest is disabled. - */ - public void disableHarvesting() - { - // Remember the last harvesting time. - this.lastHarvestingTime = -1; - // Stops the current timer. - this.lastStartHarvestingTime = -1; + this.harvestingTimeStat.stopHarvesting(); } /** * Returns the current harvesting time in ms. If this harvester is not * currently harvesting, then returns the value of the last harvesting time. - * -1 if this harvester has nerver harvested. + * 0 if this harvester has nerver harvested. * * @return The current harvesting time in ms. If this harvester is not * currently harvesting, then returns the value of the last harvesting time. - * -1 if this harvester has nerver harvested. + * 0 if this harvester has nerver harvested. */ public long getHarvestingTime() { - if(this.lastStartHarvestingTime != -1) - { - long currentHarvestingTime - = System.currentTimeMillis() - lastStartHarvestingTime; - // Retest here, while the harvesting may be end while computing the - // harvsting time. - if(this.lastStartHarvestingTime != -1) - { - return currentHarvestingTime; - } - } - // If we are ont currently harvesting, then returns the value of the - // last harvesting time. - return this.lastHarvestingTime; + return this.harvestingTimeStat.getHarvestingTime(); + } + + /** + * Returns the number of harvesting for this harvester. + * + * @return The number of harvesting for this harvester. + */ + public int getNbHarvesting() + { + return this.harvestingTimeStat.getNbHarvesting(); } } diff --git a/src/org/ice4j/ice/harvest/CandidateHarvesterSet.java b/src/org/ice4j/ice/harvest/CandidateHarvesterSet.java index c9756c2..20ae4ba 100644 --- a/src/org/ice4j/ice/harvest/CandidateHarvesterSet.java +++ b/src/org/ice4j/ice/harvest/CandidateHarvesterSet.java @@ -469,7 +469,6 @@ public class CandidateHarvesterSet public void setEnabled(boolean enabled) { logger.info("disabling harvester: " + harvester); - harvester.disableHarvesting(); this.enabled = enabled; } } diff --git a/src/org/ice4j/ice/harvest/HostCandidateHarvester.java b/src/org/ice4j/ice/harvest/HostCandidateHarvester.java index 5767cad..2281024 100644 --- a/src/org/ice4j/ice/harvest/HostCandidateHarvester.java +++ b/src/org/ice4j/ice/harvest/HostCandidateHarvester.java @@ -34,16 +34,9 @@ public class HostCandidateHarvester = Logger.getLogger(HostCandidateHarvester.class.getName()); /** - * The last harvest start time for this harvester. -1 if this harvester is - * not currently harvesting. + * Manages statisics about harvesting time. */ - private long lastStartHarvestingTime = -1; - - /** - * The last ended harvesting time for this harvester. -1 if this harvester - * has never harvested yet. - */ - private long lastHarvestingTime = -1; + private HarvestingTimeStat harvestingTimeStat = new HarvestingTimeStat(); /** * Gathers all candidate addresses on the local machine, binds sockets on @@ -419,8 +412,7 @@ public class HostCandidateHarvester */ public void startHarvesting() { - // Remember the start date of this harvester. - this.lastStartHarvestingTime = System.currentTimeMillis(); + this.harvestingTimeStat.startHarvesting(); } /** @@ -428,36 +420,30 @@ public class HostCandidateHarvester */ public void stopHarvesting() { - // Remember the last harvesting time. - this.lastHarvestingTime = this.getHarvestingTime(); - // Stops the current timer. - this.lastStartHarvestingTime = -1; + this.harvestingTimeStat.stopHarvesting(); } /** * Returns the current harvesting time in ms. If this harvester is not * currently harvesting, then returns the value of the last harvesting time. - * -1 if this harvester has nerver harvested. + * 0 if this harvester has nerver harvested. * * @return The current harvesting time in ms. If this harvester is not * currently harvesting, then returns the value of the last harvesting time. - * -1 if this harvester has nerver harvested. + * 0 if this harvester has nerver harvested. */ public long getHarvestingTime() { - if(this.lastStartHarvestingTime != -1) - { - long currentHarvestingTime - = System.currentTimeMillis() - lastStartHarvestingTime; - // Retest here, while the harvesting may be end while computing the - // harvsting time. - if(this.lastStartHarvestingTime != -1) - { - return currentHarvestingTime; - } - } - // If we are ont currently harvesting, then returns the value of the - // last harvesting time. - return this.lastHarvestingTime; + return this.harvestingTimeStat.getHarvestingTime(); + } + + /** + * Returns the number of harvesting for this harvester. + * + * @return The number of harvesting for this harvester. + */ + public int getNbHarvesting() + { + return this.harvestingTimeStat.getNbHarvesting(); } }