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

added experimental per destination propagation delay in radio connections. uses cooja time events to delay radio events.

Browse source 
currently only delaying the four main events: reception started, packet delivery, byte delivery, and reception ended

note that propagation delay is not yet implemented for all radio events - interfered radios will for example still be interfered immediately
This commit is contained in:
fros4943 2009-02-24 15:12:22 +00:00
parent 28ace6d912
commit e87d94439e
1 changed files with 80 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
tools/cooja/java/se/sics/cooja/radiomediums/AbstractRadioMedium.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: AbstractRadioMedium.java,v 1.6 2009/02/21 09:49:51 fros4943 Exp $ * $Id: AbstractRadioMedium.java,v 1.7 2009/02/24 15:12:22 fros4943 Exp $
*/ */
package se.sics.cooja.radiomediums; package se.sics.cooja.radiomediums;
@ -57,10 +57,16 @@ public abstract class AbstractRadioMedium extends RadioMedium {
private boolean isTickObserver = false; private boolean isTickObserver = false;
private class RadioMediumObservable extends Observable { private Simulation simulation = null;
private void setRadioMediumChanged() {
public class RadioMediumObservable extends Observable {
public void setRadioMediumChanged() {
setChanged(); setChanged();
} }
public void setRadioMediumChangedAndNotify() {
setChanged();
notifyObservers();
}
} }
private RadioMediumObservable radioMediumObservable = new RadioMediumObservable(); private RadioMediumObservable radioMediumObservable = new RadioMediumObservable();
@ -73,6 +79,7 @@ public abstract class AbstractRadioMedium extends RadioMedium {
* @param simulation Simulation * @param simulation Simulation
*/ */
public AbstractRadioMedium(Simulation simulation) { public AbstractRadioMedium(Simulation simulation) {
this.simulation = simulation;
} }
/** /**
@ -193,6 +200,24 @@ public abstract class AbstractRadioMedium extends RadioMedium {
RadioConnection newConnection = createConnections(radio); RadioConnection newConnection = createConnections(radio);
if (newConnection != null) { if (newConnection != null) {
activeConnections.add(newConnection); activeConnections.add(newConnection);
for (Radio r: newConnection.getDestinations()) {
if (newConnection.getDestinationDelay(r) == 0) {
r.signalReceptionStart();
} else {
/* EXPERIMENTAL: Simulating propagation delay */
final Radio delayedRadio = r;
TimeEvent delayedEvent = new TimeEvent(0) {
public void execute(long t) {
delayedRadio.signalReceptionStart();
}
};
simulation.scheduleEvent(
delayedEvent,
simulation.getSimulationTime() + newConnection.getDestinationDelay(r));
}
}
} }
// Recalculate signal strengths on all radios // Recalculate signal strengths on all radios
@ -219,7 +244,22 @@ public abstract class AbstractRadioMedium extends RadioMedium {
activeConnections.remove(connection); activeConnections.remove(connection);
finishedConnections.add(connection); finishedConnections.add(connection);
for (Radio dstRadio : connection.getDestinations()) { for (Radio dstRadio : connection.getDestinations()) {
if (connection.getDestinationDelay(dstRadio) == 0) {
dstRadio.signalReceptionEnd(); dstRadio.signalReceptionEnd();
} else {
/* EXPERIMENTAL: Simulating propagation delay */
final Radio delayedRadio = dstRadio;
TimeEvent delayedEvent = new TimeEvent(0) {
public void execute(long t) {
delayedRadio.signalReceptionEnd();
}
};
simulation.scheduleEvent(
delayedEvent,
simulation.getSimulationTime() + connection.getDestinationDelay(dstRadio));
}
} }
for (Radio dstRadio : connection.getInterfered()) { for (Radio dstRadio : connection.getInterfered()) {
dstRadio.signalReceptionEnd(); dstRadio.signalReceptionEnd();
@ -256,7 +296,23 @@ public abstract class AbstractRadioMedium extends RadioMedium {
for (Radio dstRadio : connection.getDestinations()) { for (Radio dstRadio : connection.getDestinations()) {
if (dstRadio instanceof CustomDataRadio) { if (dstRadio instanceof CustomDataRadio) {
if (connection.getDestinationDelay(dstRadio) == 0) {
((CustomDataRadio) dstRadio).receiveCustomData(data); ((CustomDataRadio) dstRadio).receiveCustomData(data);
} else {
/* EXPERIMENTAL: Simulating propagation delay */
final CustomDataRadio delayedRadio = (CustomDataRadio) dstRadio;
final Object delayedData = data;
TimeEvent delayedEvent = new TimeEvent(0) {
public void execute(long t) {
delayedRadio.receiveCustomData(delayedData);
}
};
simulation.scheduleEvent(
delayedEvent,
simulation.getSimulationTime() + connection.getDestinationDelay(dstRadio));
}
} }
} }
@ -284,8 +340,25 @@ public abstract class AbstractRadioMedium extends RadioMedium {
Radio srcRadio = connection.getSource(); Radio srcRadio = connection.getSource();
for (Radio dstRadio : connection.getDestinations()) { for (Radio dstRadio : connection.getDestinations()) {
if (!(srcRadio instanceof CustomDataRadio) || !(dstRadio instanceof CustomDataRadio)) { if (!(srcRadio instanceof CustomDataRadio) ||
!(dstRadio instanceof CustomDataRadio)) {
if (connection.getDestinationDelay(dstRadio) == 0) {
dstRadio.setReceivedPacket(packet); dstRadio.setReceivedPacket(packet);
} else {
/* EXPERIMENTAL: Simulating propagation delay */
final Radio delayedRadio = dstRadio;
final RadioPacket delayedPacket = packet;
TimeEvent delayedEvent = new TimeEvent(0) {
public void execute(long t) {
delayedRadio.setReceivedPacket(delayedPacket);
}
};
simulation.scheduleEvent(
delayedEvent,
simulation.getSimulationTime() + connection.getDestinationDelay(dstRadio));
}
} }
} }