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

guard amount of serial data being written to simulated contiki nodes

Browse source
This commit is contained in:
Fredrik Osterlind 2013-08-14 12:57:17 +02:00
parent 1842fae903
commit 5b7cc56cc5
1 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRS232.java
View file

@ -70,6 +70,8 @@ public class ContikiRS232 extends SerialUI implements ContikiMoteInterface, Poll
private ContikiMote mote = null; private ContikiMote mote = null;
private SectionMoteMemory moteMem = null; private SectionMoteMemory moteMem = null;
static final int SERIAL_BUF_SIZE = 1024; /* rs232.c:40 */
/** /**
* Creates an interface to the RS232 at mote. * Creates an interface to the RS232 at mote.
* *
@ -109,6 +111,11 @@ public class ContikiRS232 extends SerialUI implements ContikiMoteInterface, Poll
/* Append to existing buffer */ /* Append to existing buffer */
int oldSize = moteMem.getIntValueOf("simSerialReceivingLength"); int oldSize = moteMem.getIntValueOf("simSerialReceivingLength");
int newSize = oldSize + dataToAppend.length; int newSize = oldSize + dataToAppend.length;
if (newSize > SERIAL_BUF_SIZE) {
logger.fatal("ContikiRS232: dropping rs232 data #1, buffer full: " + oldSize + " -> " + newSize);
mote.requestImmediateWakeup();
return;
}
moteMem.setIntValueOf("simSerialReceivingLength", newSize); moteMem.setIntValueOf("simSerialReceivingLength", newSize);
byte[] oldData = moteMem.getByteArray("simSerialReceivingData", oldSize); byte[] oldData = moteMem.getByteArray("simSerialReceivingData", oldSize);
@ -159,6 +166,11 @@ public class ContikiRS232 extends SerialUI implements ContikiMoteInterface, Poll
/* Append to existing buffer */ /* Append to existing buffer */
int oldSize = moteMem.getIntValueOf("simSerialReceivingLength"); int oldSize = moteMem.getIntValueOf("simSerialReceivingLength");
int newSize = oldSize + dataToAppend.length; int newSize = oldSize + dataToAppend.length;
if (newSize > SERIAL_BUF_SIZE) {
logger.fatal("ContikiRS232: dropping rs232 data #2, buffer full: " + oldSize + " -> " + newSize);
mote.requestImmediateWakeup();
return;
}
moteMem.setIntValueOf("simSerialReceivingLength", newSize); moteMem.setIntValueOf("simSerialReceivingLength", newSize);
byte[] oldData = moteMem.getByteArray("simSerialReceivingData", oldSize); byte[] oldData = moteMem.getByteArray("simSerialReceivingData", oldSize);
@ -212,6 +224,11 @@ public class ContikiRS232 extends SerialUI implements ContikiMoteInterface, Poll
/* Append to existing buffer */ /* Append to existing buffer */
int oldSize = moteMem.getIntValueOf("simSerialReceivingLength"); int oldSize = moteMem.getIntValueOf("simSerialReceivingLength");
int newSize = oldSize + dataToAppend.length; int newSize = oldSize + dataToAppend.length;
if (newSize > SERIAL_BUF_SIZE) {
logger.fatal("ContikiRS232: dropping rs232 data #3, buffer full: " + oldSize + " -> " + newSize);
mote.requestImmediateWakeup();
return;
}
moteMem.setIntValueOf("simSerialReceivingLength", newSize); moteMem.setIntValueOf("simSerialReceivingLength", newSize);
byte[] oldData = moteMem.getByteArray("simSerialReceivingData", oldSize); byte[] oldData = moteMem.getByteArray("simSerialReceivingData", oldSize);
@ -229,13 +246,26 @@ public class ContikiRS232 extends SerialUI implements ContikiMoteInterface, Poll
mote.requestImmediateWakeup(); mote.requestImmediateWakeup();
} }
}; };
/* Simulation thread: schedule immediately */
if (mote.getSimulation().isSimulationThread()) {
mote.getSimulation().scheduleEvent(
pendingBytesEvent,
mote.getSimulation().getSimulationTime()
);
return;
}
mote.getSimulation().invokeSimulationThread(new Runnable() { mote.getSimulation().invokeSimulationThread(new Runnable() {
public void run() { public void run() {
mote.getSimulation().scheduleEvent( if (pendingBytesEvent.isScheduled()) {
pendingBytesEvent, return;
mote.getSimulation().getSimulationTime() }
); mote.getSimulation().scheduleEvent(
} pendingBytesEvent,
mote.getSimulation().getSimulationTime()
);
}
}); });
} }