diff --git a/src/de/tud/kom/p2psim/impl/churn/CSVBasedChurnModel.java b/src/de/tud/kom/p2psim/impl/churn/CSVBasedChurnModel.java index cd3f5f29b7d84b3744c1a073b32cda0837fcddef..f748248b146d3a7cd0eb6e01ac9553cda770ff72 100644 --- a/src/de/tud/kom/p2psim/impl/churn/CSVBasedChurnModel.java +++ b/src/de/tud/kom/p2psim/impl/churn/CSVBasedChurnModel.java @@ -33,6 +33,8 @@ import de.tud.kom.p2psim.api.common.SimHost; import de.tud.kom.p2psim.api.network.SimNetInterface; import de.tud.kom.p2psim.impl.scenario.DefaultConfigurator; import de.tud.kom.p2psim.impl.simengine.Simulator; +import de.tudarmstadt.maki.simonstrator.api.Monitor; +import de.tudarmstadt.maki.simonstrator.api.Monitor.Level; import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor; /** @@ -176,8 +178,7 @@ public class CSVBasedChurnModel implements ChurnModel { } private void parseTrace(String filename) { - System.out.println("=============================="); - System.out.println("Reading trace from " + filename); + Monitor.log(this.getClass(), Level.DEBUG, "Reading trace from " + filename); /* * This parser works for the following csv file structure. diff --git a/src/de/tud/kom/p2psim/impl/churn/MaxPeerCountChurnGenerator.java b/src/de/tud/kom/p2psim/impl/churn/MaxPeerCountChurnGenerator.java index ee8c4fe92bf4f92276194611ea1abefb7cece3d9..479fde6bf3e4d31459bab159efe6cd7bcc36f94c 100644 --- a/src/de/tud/kom/p2psim/impl/churn/MaxPeerCountChurnGenerator.java +++ b/src/de/tud/kom/p2psim/impl/churn/MaxPeerCountChurnGenerator.java @@ -39,8 +39,10 @@ import de.tud.kom.p2psim.impl.util.toolkits.CollectionHelpers; import de.tud.kom.p2psim.impl.util.toolkits.Predicates; import de.tudarmstadt.maki.simonstrator.api.Event; import de.tudarmstadt.maki.simonstrator.api.EventHandler; +import de.tudarmstadt.maki.simonstrator.api.Monitor; import de.tudarmstadt.maki.simonstrator.api.Randoms; import de.tudarmstadt.maki.simonstrator.api.Time; +import de.tudarmstadt.maki.simonstrator.api.Monitor.Level; import de.tudarmstadt.maki.simonstrator.api.component.ComponentNotAvailableException; import de.tudarmstadt.maki.simonstrator.api.component.GlobalComponent; import de.tudarmstadt.maki.simonstrator.api.component.LifecycleComponent; @@ -319,8 +321,7 @@ public class MaxPeerCountChurnGenerator * @param filename */ private void parseTrace(String filename) { - System.out.println("=============================="); - System.out.println("Reading trace from " + filename); + Monitor.log(this.getClass(), Level.DEBUG, "Reading trace from " + filename); /* * This parser works for the following csv file structure. diff --git a/src/de/tud/kom/p2psim/impl/churn/TraceBasedChurnModel.java b/src/de/tud/kom/p2psim/impl/churn/TraceBasedChurnModel.java index 00af582bedd3bf9fa1db82a07ccac70536c5c8b6..e9e1f237ab2e48f2351a87f7d14aa94daf103f04 100644 --- a/src/de/tud/kom/p2psim/impl/churn/TraceBasedChurnModel.java +++ b/src/de/tud/kom/p2psim/impl/churn/TraceBasedChurnModel.java @@ -34,8 +34,10 @@ import java.util.Random; import de.tud.kom.p2psim.api.churn.ChurnModel; import de.tud.kom.p2psim.api.common.SimHost; import de.tud.kom.p2psim.api.network.SimNetInterface; +import de.tudarmstadt.maki.simonstrator.api.Monitor; import de.tudarmstadt.maki.simonstrator.api.Randoms; import de.tudarmstadt.maki.simonstrator.api.Time; +import de.tudarmstadt.maki.simonstrator.api.Monitor.Level; import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor; /** @@ -121,9 +123,8 @@ public class TraceBasedChurnModel implements ChurnModel { } private void parseTrace(String filename) { - System.out.println("=============================="); - System.out.println("Reading trace from " + filename); - + Monitor.log(this.getClass(), Level.DEBUG, "Reading trace from " + filename); + /* * IDs to exclude as they are already online and we want to simulate the * startup by adding new hosts over time