From 2b5f3bc6bd7df6bbdb434cb3401c9ac2bbecb494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20=27Morty=27=20Str=C3=BCbe?= Date: Tue, 20 Aug 2013 10:18:12 +0200 Subject: [PATCH] Add MSPSim Logging --- .../src/se/sics/cooja/mspmote/MspMote.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java index aaec1f11d..572982b5d 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java @@ -63,7 +63,10 @@ import se.sics.mspsim.cli.CommandHandler; import se.sics.mspsim.cli.LineListener; import se.sics.mspsim.cli.LineOutputStream; import se.sics.mspsim.core.EmulationException; +import se.sics.mspsim.core.LogListener; +import se.sics.mspsim.core.Loggable; import se.sics.mspsim.core.MSP430; +import se.sics.mspsim.core.EmulationLogger.WarningType; import se.sics.mspsim.platform.GenericNode; import se.sics.mspsim.ui.ManagedWindow; import se.sics.mspsim.ui.WindowManager; @@ -210,6 +213,21 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc this.myCpu = node.getCPU(); this.myCpu.setMonitorExec(true); this.myCpu.setTrace(0); /* TODO Enable */ + + LogListener ll = new LogListener() { + private Logger mlogger = Logger.getLogger("MSPSim"); + @Override + public void log(Loggable source, String message) { + mlogger.debug("" + getID() + ": " + source.getID() + ": " + message); + } + + @Override + public void logw(Loggable source, WarningType type, String message) throws EmulationException { + mlogger.warn("" + getID() +": " + "# " + source.getID() + "[" + type + "]: " + message); + } + }; + + this.myCpu.getLogger().addLogListener(ll); logger.info("Loading firmware from: " + fileELF.getAbsolutePath()); GUI.setProgressMessage("Loading " + fileELF.getName());