loic/loosely-coupled-dss-extended
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/loosely-coupled-dss-extended.git synced 2025-04-05 19:16:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Debug simulator and add paper scenarios

Browse source
This commit is contained in:
Loic Guegan 2021-05-19 16:45:04 +02:00
parent c757315893
commit f7c6f8ad56
13 changed files with 3608 additions and 3282 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -3,6 +3,6 @@ libs/simgrid
libs/rapidjson
compile_commands.json
platform.xml
scenarios
./scenarios
inputs.json
results/logs

BIN
results/energy.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 247 KiB

After

Width:  |  Height:  |  Size: 260 KiB

6410
results/results.csv
View file

File diff suppressed because it is too large Load diff

58
results/scenarios/baseline.json Normal file
View file

@ -0,0 +1,58 @@
{
"seed": 200,
"bitrate": "0.5MBps",
"latency": 0.01,
"extended": false,
"hint_size": 8,
"nodes": {
"on0": {
"use_hint": false,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": true,
"data_size": 1000000,
"wake_ts": [
5,
50
],
"wake_duration": [
10,
10
]
},
"on1": {
"use_hint": true,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": false,
"data_size": 1000000,
"wake_ts": [
0,
20
],
"wake_duration": [
10,
10
]
},
"on2": {
"use_hint": true,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": false,
"data_size": 1000000,
"wake_ts": [
25
],
"wake_duration": [
10
]
}
}
}

58
results/scenarios/extended.json Normal file
View file

@ -0,0 +1,58 @@
{
"seed": 200,
"bitrate": "0.2MBps",
"latency": 0.01,
"extended": true,
"hint_size": 8,
"nodes": {
"on0": {
"use_hint": false,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": true,
"data_size": 1000000,
"wake_ts": [
5,
50
],
"wake_duration": [
10,
10
]
},
"on1": {
"use_hint": true,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": false,
"data_size": 1000000,
"wake_ts": [
0,
20
],
"wake_duration": [
10,
10
]
},
"on2": {
"use_hint": true,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": false,
"data_size": 1000000,
"wake_ts": [
25
],
"wake_duration": [
10
]
}
}
}

58
results/scenarios/hint.json Normal file
View file

@ -0,0 +1,58 @@
{
"seed": 200,
"bitrate": "0.5MBps",
"latency": 0.01,
"extended": false,
"hint_size": 8,
"nodes": {
"on0": {
"use_hint": true,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": true,
"data_size": 1000000,
"wake_ts": [
5,
50
],
"wake_duration": [
10,
10
]
},
"on1": {
"use_hint": true,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": false,
"data_size": 1000000,
"wake_ts": [
0,
20
],
"wake_duration": [
10,
10
]
},
"on2": {
"use_hint": true,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": false,
"data_size": 1000000,
"wake_ts": [
25
],
"wake_duration": [
10
]
}
}
}

58
results/scenarios/hint_extended.json Normal file
View file

@ -0,0 +1,58 @@
{
"seed": 200,
"bitrate": "0.2MBps",
"latency": 0.01,
"extended": true,
"hint_size": 8,
"nodes": {
"on0": {
"use_hint": true,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": true,
"data_size": 1000000,
"wake_ts": [
5,
50
],
"wake_duration": [
10,
10
]
},
"on1": {
"use_hint": true,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": false,
"data_size": 1000000,
"wake_ts": [
0,
20
],
"wake_duration": [
10,
10
]
},
"on2": {
"use_hint": true,
"power_off": 0.0,
"power_on": 0.4,
"power_rx": 0.65,
"power_tx": 0.65,
"is_sender": false,
"data_size": 1000000,
"wake_ts": [
25
],
"wake_duration": [
10
]
}
}
}

52
results/scenarios/scenario.sh Executable file
View file

@ -0,0 +1,52 @@
#!/usr/bin/env bash
set -e
wai=$(dirname $(readlink -f "$0"))
inputs="${wai}/../../inputs.json"
simulator="make -C ${wai}/../../ run"
run-simulation () {
# Run simulations
$simulator 2>&1
}
echo "Which scenario to run:"
echo "(a) Baseline"
echo "(b) Extended"
echo "(c) Hint"
echo "(d) Hint+Extended"
read -p "> " -n 1 -r
echo
case $REPLY in
a)
echo "Run baseline scenarios (a)"
cp ${wai}/baseline.json $inputs
run-simulation
;;
b)
echo "Run extended scenarios (b)"
cp ${wai}/extended.json $inputs
run-simulation
;;
c)
echo "Run hint scenarios (c)"
cp ${wai}/hint.json $inputs
run-simulation
;;
d)
echo "Run hint+extended scenarios (d)"
cp ${wai}/hint_extended.json $inputs
run-simulation
;;
*)
echo "Unknown choice"
exit 1
;;
esac

BIN
results/success.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 184 KiB

After

Width:  |  Height:  |  Size: 187 KiB

40
results/tables-energy.org
View file

@ -1,33 +1,33 @@
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|---------:|--------:|
|baseline |lora | 60| 62.57994| 599.9171|
|extended |lora | 60| 160.41870| 659.9538|
|hint |lora | 60| 142.47554| 659.4854|
|hintandextended |lora | 60| 160.41978| 659.9545|
|baseline |lora | 60| 16.32262| 585.4111|
|extended |lora | 60| 112.35299| 644.3173|
|hint |lora | 60| 140.69738| 657.3728|
|hintandextended |lora | 60| 112.35377| 644.3179|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|--------:|--------:|
|baseline |nbiot | 60| 254.6843| 670.2415|
|extended |nbiot | 60| 267.4312| 672.2935|
|hint |nbiot | 60| 251.8964| 686.3856|
|hintandextended |nbiot | 60| 267.4376| 672.2998|
|baseline |nbiot | 60| 60.80770| 609.9383|
|extended |nbiot | 60| 58.96556| 608.3465|
|hint |nbiot | 60| 91.16175| 635.0423|
|hintandextended |nbiot | 60| 58.96269| 608.3498|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|---------:|--------:|
|baseline |lora | 180| 99.38926| 1793.214|
|extended |lora | 180| 115.82014| 1799.546|
|hint |lora | 180| 122.50058| 1881.829|
|hintandextended |lora | 180| 115.79631| 1799.530|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|--------:|--------:|
|baseline |lora | 180| 182.9307| 1819.456|
|extended |lora | 180| 238.3423| 1837.015|
|hint |lora | 180| 176.8297| 1903.016|
|hintandextended |lora | 180| 238.3433| 1837.015|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|--------:|--------:|
|baseline |nbiot | 180| 741.7280| 1987.778|
|extended |nbiot | 180| 708.2636| 1961.533|
|hint |nbiot | 180| 697.9564| 1986.061|
|hintandextended |nbiot | 180| 708.2662| 1961.541|
|baseline |nbiot | 180| 232.1779| 1833.526|
|extended |nbiot | 180| 196.7046| 1809.951|
|hint |nbiot | 180| 239.7566| 1848.624|
|hintandextended |nbiot | 180| 196.6927| 1809.954|

32
results/tables-stats.org
View file

@ -1,33 +1,33 @@
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |lora | 60| 0.000000| 0.00| 806.400| 581.1460| 1440.000| 1439.923| 28.435|
|extended |lora | 60| 1.509468| 5.73| 1170.140| 613.5733| 2089.535| 1500.595| 18.270|
|hint |lora | 60| 0.000000| 0.00| 806.400| 646.1295| 1440.000| 1568.298| 27.975|
|hintandextended |lora | 60| 1.509468| 5.73| 1170.144| 613.5736| 2089.542| 1500.596| 18.270|
|baseline |lora | 60| 0.000000| 0.00| 632.3280| 581.1460| 1440.000| 1439.923| 28.435|
|extended |lora | 60| 1.509468| 5.73| 982.5020| 613.5733| 2089.535| 1500.595| 18.270|
|hint |lora | 60| 0.000000| 0.00| 781.0494| 646.1295| 1440.000| 1568.298| 27.975|
|hintandextended |lora | 60| 1.509468| 5.73| 982.5048| 613.5736| 2089.542| 1500.596| 18.270|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |nbiot | 60| 1.296148| 2.22| 1512.027| 593.7155| 1440.026| 1439.923| 26.955|
|extended |nbiot | 60| 1.594305| 6.03| 1557.360| 591.8329| 1483.200| 1443.941| 21.815|
|hint |nbiot | 60| 1.580153| 5.84| 1512.023| 611.3277| 1440.022| 1466.598| 26.245|
|hintandextended |nbiot | 60| 1.594305| 6.03| 1557.387| 591.8374| 1483.226| 1443.944| 21.815|
|baseline |nbiot | 60| 1.296148| 2.22| 788.3890| 593.7155| 1440.026| 1439.923| 26.955|
|extended |nbiot | 60| 1.594305| 6.03| 789.9963| 591.8329| 1483.200| 1443.941| 21.815|
|hint |nbiot | 60| 1.580153| 5.84| 895.9030| 611.3277| 1440.022| 1466.598| 26.245|
|hintandextended |nbiot | 60| 1.594305| 6.03| 789.9868| 591.8374| 1483.226| 1443.944| 21.815|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|--------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |lora | 180| 1.2001256| 1.630000| 2419.169| 1764.936| 4319.945| 4317.934| 35.41|
|extended |lora | 180| 0.9293588| 9.246269| 2639.443| 1789.563| 4713.291| 4372.638| 17.52|
|hint |lora | 180| 0.9888787| 8.934911| 2419.164| 1863.918| 4319.935| 4539.564| 29.18|
|hintandextended |lora | 180| 0.9293588| 9.246269| 2639.447| 1789.564| 4713.298| 4372.639| 17.52|
|baseline |lora | 180| 1.2001256| 1.630000| 2104.267| 1764.936| 4319.945| 4317.934| 35.41000|
|extended |lora | 180| 0.9293588| 9.246269| 2134.104| 1779.762| 4713.291| 4372.638| 17.52000|
|hint |lora | 180| 0.9888787| 8.934911| 2144.054| 1861.965| 4319.935| 4539.564| 29.18000|
|hintandextended |lora | 180| 0.9326243| 9.248120| 2133.659| 1779.823| 4712.014| 4372.671| 17.51256|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|--------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |nbiot | 180| 1.0855147| 8.880240| 4535.947| 1797.208| 4319.949| 4317.964| 24.380|
|extended |nbiot | 180| 0.8422925| 9.352459| 4556.108| 1822.579| 4339.151| 4320.981| 20.140|
|hint |nbiot | 180| 0.8408034| 9.344262| 4535.917| 1849.502| 4319.921| 4353.619| 22.545|
|hintandextended |nbiot | 180| 0.8422925| 9.352459| 4556.121| 1822.586| 4339.163| 4320.982| 20.140|
|baseline |nbiot | 180| 1.0855147| 8.880240| 2580.136| 1777.689| 4319.949| 4317.964| 24.380|
|extended |nbiot | 180| 0.8422925| 9.352459| 2445.260| 1775.927| 4339.151| 4320.981| 20.140|
|hint |nbiot | 180| 0.8408034| 9.344262| 2597.025| 1808.543| 4319.921| 4353.619| 22.545|
|hintandextended |nbiot | 180| 0.8422925| 9.352459| 2445.222| 1775.932| 4339.163| 4320.982| 20.140|

BIN
scenarios Executable file
View file

Binary file not shown.

122
src/simulator.cc
View file

@ -28,10 +28,28 @@
/// @brief Note that we need to simulate latency our self since we need to send instantaneous messages
#define SEND(instruction) \
{ \
simgrid::s4u::this_actor::sleep_for(i.latency); \
TRACK_UPTIME(simgrid::s4u::this_actor::sleep_for(i.latency > uptime ? uptime : i.latency)); \
instruction; \
}
#define FORWARD_HINT(TRY_FORWARD_DURING) \
{ \
if(hint_forward!=NULL && CLOCK<hint_forward->hint){ \
hint_forward->HisForward=true; \
hint_forward->DedicatedMailbox="hint_forward"; \
try { \
XBT_INFO("%s try to forward a hint",CNAME); \
TRACK_UPTIME(m->put(hint_forward,0,TRY_FORWARD_DURING)); \
simgrid::s4u::Mailbox *m_ded= simgrid::s4u::Mailbox::by_name(hint_forward->DedicatedMailbox); \
MODE_TX(); \
SEND(m_ded->put(hint_forward,0,uptime)); \
} \
catch(...){ \
XBT_INFO("%s fail to forward a hint",CNAME); \
} \
} \
}
/// @brief Required by SimGrid
XBT_LOG_NEW_DEFAULT_CATEGORY(simulator, "[DAO] Loosely Coupled DSS");
@ -44,11 +62,12 @@ typedef unsigned int u32;
*/
class Payload{
public:
Payload():hint(0),duration(0),HasHint(false){}
Payload(Payload &p):hint(p.hint),duration(p.duration),HasHint(p.HasHint),DedicatedMailbox(p.DedicatedMailbox){}
Payload():hint(0),duration(0),HasHint(false),HisForward(false){}
Payload(Payload &p):hint(p.hint),duration(p.duration),HasHint(p.HasHint),DedicatedMailbox(p.DedicatedMailbox),HisForward(p.HisForward){}
double hint; // The timestamp that should be used by the receiver
double duration; // The duration that should be used by the receiver
bool HasHint;
bool HisForward;
std::string DedicatedMailbox; // Dedicated mailbox used by the sender/receiver
};
@ -107,6 +126,7 @@ static void obs_node(std::vector<std::string> args) {
u32 nRcvFail=0;
u32 nSend=0;
double totalUptime=0;
Payload *hint_forward=NULL;
while(i.ShouldContinue()){
// Start by sleeping
XBT_INFO("%s is spleeping",CNAME);
@ -119,6 +139,7 @@ static void obs_node(std::vector<std::string> args) {
double uptime=i.GetDuration();
double upsince=simgrid::s4u::Engine::get_clock();
double upuntil=i.GetTS()+i.GetDuration();
bool forward_mode=false;
while(uptime>0)
{
if(i.is_sender){
@ -135,7 +156,6 @@ static void obs_node(std::vector<std::string> args) {
// This allow first to detect if their is a receiver
// (to not cause deadlock for the extended mode) and second
// to inform the receiver if he should get a hint first
MODE_TX();
TRACK_UPTIME(m->put(p,0,uptime));
simgrid::s4u::Mailbox *m_ded= simgrid::s4u::Mailbox::by_name(p->DedicatedMailbox);
// First send hint if it is required
@ -143,6 +163,7 @@ static void obs_node(std::vector<std::string> args) {
TRACK_UPTIME(SEND(m_ded->put(p,i.hint_size,uptime)));
XBT_INFO("%s sent a hint successfully",CNAME);
}
MODE_TX();
// Then try sending the data
if(i.extended){
SEND(m_ded->put(p,i.data_size));
@ -162,42 +183,75 @@ static void obs_node(std::vector<std::string> args) {
}
}
else if(!isObserver){
Payload *p; // Received data
Payload *hint; // To Save the received hint
bool hintReceived=false; // In case of error during data rx this will be use to check if we could use the *hint Payload object
try {
// Get the instantaneous message
TRACK_UPTIME(p=m->get<Payload>(uptime));
simgrid::s4u::Mailbox *m_ded= simgrid::s4u::Mailbox::by_name(p->DedicatedMailbox);
// Start receiving data
MODE_RX();
if(p->HasHint){
TRACK_UPTIME(p=m_ded->get<Payload>(uptime));
XBT_INFO("%s received a hint successfully",CNAME);
hint=new Payload(*p); // Save hint
hintReceived=true;
// Here we try to forward hint for 1 sec and try to receive data for 5 secs
double try_for=forward_mode ? 1 : 1;
try_for=try_for>uptime ? uptime : try_for; // Ensure we do not exceed uptime
// Forward hint mode
if(forward_mode){
if(hint_forward!=NULL && CLOCK < hint_forward->hint){
FORWARD_HINT(try_for); // Try forward for 5 seconds then switch to received mode
}
if(i.extended)
p=m_ded->get<Payload>(); // Fetch data until sended
else
p=m_ded->get<Payload>(uptime); // Fetch data until sended or uptime expire
// If we reach here, data has been received successfully
XBT_INFO("%s received data successfully",CNAME);
nDataRcv++;
isObserver=true;
i.is_sender=false;
}catch(...){
XBT_INFO("%s could not receive any data",CNAME);
nRcvFail++;
if(hintReceived)
i.AddEvent(hint->hint, hint->duration); // Add the hint to the event list
}
else { // Receiving mode
Payload *p; // Received data
Payload *hint; // To Save the received hint
bool hintReceived=false; // In case of error during data rx this will be use to check if we could use the *hint Payload object
try {
// Get the instantaneous message
do {
TRACK_UPTIME(p=m->get<Payload>(try_for));
if(p->HisForward){
if(hint_forward==NULL || (hint_forward !=NULL && p->hint!=hint_forward->hint)){
simgrid::s4u::Mailbox *m_ded=simgrid::s4u::Mailbox::by_name(p->DedicatedMailbox);
MODE_RX();
TRACK_UPTIME(p=m_ded->get<Payload>(uptime));
MODE_ON();
XBT_INFO("%s received a forwarded hint successfully",CNAME);
if(CLOCK < p->hint){
i.AddEvent(p->hint, p->duration);
hint_forward=new Payload(*p);
}
}
}
} while(p->HisForward);
simgrid::s4u::Mailbox *m_ded= simgrid::s4u::Mailbox::by_name(p->DedicatedMailbox);
// Start receiving data
MODE_RX();
if(p->HasHint){
TRACK_UPTIME(p=m_ded->get<Payload>(uptime));
XBT_INFO("%s received a hint successfully",CNAME);
hint=new Payload(*p); // Save hint
hint_forward=new Payload(*p); // Enable hint forwarding
hintReceived=true;
}
if(i.extended)
p=m_ded->get<Payload>(); // Fetch data until sended
else
p=m_ded->get<Payload>(uptime); // Fetch data until sended or uptime expire
// If we reach here, data has been received successfully
XBT_INFO("%s received data successfully",CNAME);
nDataRcv++;
isObserver=true;
i.is_sender=false;
}catch(...){
XBT_INFO("%s could not receive any data",CNAME);
nRcvFail++;
if(hintReceived)
i.AddEvent(hint->hint, hint->duration); // Add the hint to the event list
}
}
forward_mode=!forward_mode; // Toggle mode (go back and forth between receiving and forwarding)
}
else {
XBT_INFO("%s is observing his environment...",CNAME);
MODE_ON();
simgrid::s4u::this_actor::sleep_for(uptime);
if(hint_forward!=NULL && CLOCK < hint_forward->hint){
FORWARD_HINT(uptime);
}
else{
simgrid::s4u::this_actor::sleep_for(uptime);
}
}
uptime=upuntil-CLOCK; // Note that uptime can be < 0 in extended mode
}