deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #336 from cmorty/MSPSim_Log

Browse source 
Add MSPSim Logging
This commit is contained in:
Fredrik Österlind 2013-08-20 01:51:16 -07:00
parent a07d332339 2b5f3bc6bd
commit e6bd0490fd
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
View file

@ -63,7 +63,10 @@ import se.sics.mspsim.cli.CommandHandler;
import se.sics.mspsim.cli.LineListener; import se.sics.mspsim.cli.LineListener;
import se.sics.mspsim.cli.LineOutputStream; import se.sics.mspsim.cli.LineOutputStream;
import se.sics.mspsim.core.EmulationException; 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.MSP430;
import se.sics.mspsim.core.EmulationLogger.WarningType;
import se.sics.mspsim.platform.GenericNode; import se.sics.mspsim.platform.GenericNode;
import se.sics.mspsim.ui.ManagedWindow; import se.sics.mspsim.ui.ManagedWindow;
import se.sics.mspsim.ui.WindowManager; 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 = node.getCPU();
this.myCpu.setMonitorExec(true); this.myCpu.setMonitorExec(true);
this.myCpu.setTrace(0); /* TODO Enable */ 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()); logger.info("Loading firmware from: " + fileELF.getAbsolutePath());
GUI.setProgressMessage("Loading " + fileELF.getName()); GUI.setProgressMessage("Loading " + fileELF.getName());