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

Browse source
This commit is contained in:
Loic Guegan 2021-05-25 11:49:38 +02:00
parent 410667ce90
commit 74ae104dc4
6 changed files with 6573 additions and 6016 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
results/energy.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 226 KiB

After

Width:  |  Height:  |  Size: 269 KiB

12496
results/results.csv
View file

File diff suppressed because it is too large Load diff

BIN
results/success.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 158 KiB

After

Width:  |  Height:  |  Size: 182 KiB

52
results/tables-energy.org
View file

@ -1,33 +1,33 @@
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|----------:|--------:|
|baseline |lora | 60| 16.20871| 585.2851|
|extended |lora | 60| 109.94211| 642.2070|
|hint |lora | 60| 43.05886| 585.6350|
|hintandextended |lora | 60| 2515.09999| 998.2392|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|----------:|---------:|
|baseline |nbiot | 60| 59.68490| 608.9268|
|extended |nbiot | 60| 57.68462| 607.3198|
|hint |nbiot | 60| 2443.87299| 965.7313|
|hintandextended |nbiot | 60| 3048.25713| 1273.7034|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|---------:|--------:|
|baseline |lora | 180| 98.1097| 1792.244|
|extended |lora | 180| 116.7433| 1797.571|
|hint |lora | 180| 4645.6128| 3485.132|
|hintandextended |lora | 180| 4064.7439| 3574.090|
|baseline |lora | 60| 16.20871| 585.2851|
|extended |lora | 60| 109.94211| 642.2070|
|hint |lora | 60| 23.04672| 590.4482|
|hintandextended |lora | 60| 121.59617| 652.9509|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|---------:|--------:|
|baseline |nbiot | 180| 226.2301| 1830.006|
|extended |nbiot | 180| 196.1743| 1809.083|
|hint |nbiot | 180| 4005.7292| 3803.934|
|hintandextended |nbiot | 180| 3656.4500| 3569.778|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|--------:|--------:|
|baseline |nbiot | 60| 59.68490| 608.9268|
|extended |nbiot | 60| 57.68462| 607.3198|
|hint |nbiot | 60| 92.28759| 633.0306|
|hintandextended |nbiot | 60| 91.35502| 630.0221|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|--------:|--------:|
|baseline |lora | 180| 98.1097| 1792.244|
|extended |lora | 180| 116.7433| 1797.571|
|hint |lora | 180| 197.1602| 2032.911|
|hintandextended |lora | 180| 156.5318| 1902.283|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|--------:|--------:|
|baseline |nbiot | 180| 226.2301| 1830.006|
|extended |nbiot | 180| 196.1743| 1809.083|
|hint |nbiot | 180| 334.8521| 2070.183|
|hintandextended |nbiot | 180| 339.7212| 2045.226|

20
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| 631.6656| 581.0687| 1440.00| 1439.945| 0|
|extended |lora | 60| 1.584776| 5.56| 969.6080| 612.4433| 2068.18| 1498.759| 0|
|hint |lora | 60| 0.000000| 0.00| 628.0144| 581.3061| 1440.00| 1443.307| 0|
|hintandextended |lora | 60| 1.844347| 5.82| 993.9211| 998.6402| 2076.32| 2459.463| 0|
|baseline |lora | 60| 0.000000| 0.00| 631.6656| 581.0687| 1440.000| 1439.945| 0|
|extended |lora | 60| 1.584776| 5.56| 969.6080| 612.4433| 2068.180| 1498.759| 0|
|hint |lora | 60| 0.000000| 0.00| 641.8877| 585.7719| 1440.000| 1450.318| 0|
|hintandextended |lora | 60| 1.668605| 6.06| 1017.3031| 619.8279| 2112.144| 1512.247| 0|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |nbiot | 60| 1.279638| 2.17| 784.3185| 592.9821| 1440.000| 1439.945| 0|
|extended |nbiot | 60| 1.643598| 5.84| 783.7103| 591.2844| 1480.464| 1443.693| 0|
|hint |nbiot | 60| 1.799972| 2.45| 810.3055| 981.2274| 1440.000| 2406.739| 0|
|hintandextended |nbiot | 60| 2.074472| 6.14| 865.7780| 1312.0423| 1465.718| 3225.193| 0|
|hint |nbiot | 60| 2.420452| 4.20| 881.8043| 610.4148| 1440.000| 1463.299| 0|
|hintandextended |nbiot | 60| 1.876462| 6.71| 901.2011| 605.3695| 1481.891| 1459.502| 0|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |lora | 180| 1.2608719| 1.69| 2097.188| 1764.522| 4319.890| 4317.521| 0|
|extended |lora | 180| 1.2007994| 9.75| 2167.506| 1763.941| 4765.810| 4353.125| 0|
|hint |lora | 180| 3.0891796| 3.18| 2103.666| 3649.202| 4319.890| 9018.256| 0|
|hintandextended |lora | 180| 0.7447459| 10.53| 2204.091| 3699.433| 4487.517| 9122.242| 0|
|hint |lora | 180| 1.6142046| 10.02| 2191.955| 2018.452| 4319.890| 4838.773| 0|
|hintandextended |lora | 180| 0.5526794| 10.76| 2313.263| 1864.921| 4782.424| 4533.121| 0|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |nbiot | 180| 1.2758835| 9.22| 2552.287| 1764.344| 4319.890| 4317.521| 0|
|extended |nbiot | 180| 1.1415035| 9.90| 2446.900| 1751.100| 4341.132| 4319.236| 0|
|hint |nbiot | 180| 0.9428090| 10.40| 3260.203| 3853.726| 4319.890| 9173.079| 0|
|hintandextended |nbiot | 180| 0.6620293| 10.69| 3156.078| 3607.525| 4331.405| 8585.471| 0|
|hint |nbiot | 180| 0.5706633| 10.76| 2927.059| 1992.285| 4319.890| 4497.933| 0|
|hintandextended |nbiot | 180| 0.5966235| 10.74| 2945.771| 1963.358| 4332.398| 4472.000| 0|

21
src/simulator.cc
View file

@ -47,6 +47,8 @@
} \
catch(...){ \
XBT_INFO("%s fail to forward a hint",CNAME); \
MODE_ON(); \
TRACK_UPTIME(simgrid::s4u::this_actor::sleep_for(FOR(TRY_FORWARD_DURING))); \
} \
} \
}
@ -117,7 +119,7 @@ static void obs_node(std::vector<std::string> args) {
// Init various variables
std::string selfName = simgrid::s4u::this_actor::get_host()->get_name();
simgrid::s4u::this_actor::get_host()->turn_on();
Inputs i(selfName); // Load node input parameters from the json file
Inputs i=(selfName); // Load node input parameters from the json file
simgrid::s4u::Mailbox *m = simgrid::s4u::Mailbox::by_name("medium");
XBT_INFO("Deploying observation node %s",CNAME);
@ -134,7 +136,7 @@ static void obs_node(std::vector<std::string> args) {
bool isObserver=false;
while(i.ShouldContinue()){
// Start by sleeping
XBT_INFO("%s is spleeping",CNAME);
XBT_INFO("%s is sleeping",CNAME);
MODE_OFF();
simgrid::s4u::this_actor::sleep_until(i.GetTS());
MODE_ON();
@ -214,7 +216,7 @@ static void obs_node(std::vector<std::string> args) {
if(forward_mode){
if(i.use_hint && hint_forward!=NULL && CLOCK < hint_forward->hint){
try {
FORWARD_HINT(FOR(0.3)); // Try forward for 5 seconds then switch to received mode
FORWARD_HINT(FOR(0.3)); // Try forward for 0.3 seconds then switch to received mode
}
catch(...){}
}
@ -226,7 +228,7 @@ static void obs_node(std::vector<std::string> args) {
do {
TRACK_UPTIME(p=m->get<Payload>(FOR(1)));
if(p->HisForward){
if(hint_forward==NULL || (hint_forward !=NULL && p->hint!=hint_forward->hint)){
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));
@ -241,10 +243,6 @@ static void obs_node(std::vector<std::string> args) {
}
} while(p->HisForward);
simgrid::s4u::Mailbox *m_ded= simgrid::s4u::Mailbox::by_name(p->DedicatedMailbox);
// Inform the sender that we do not want to abort
Payload *ack=new Payload();
ack->Abort=false;
m_ded->put(ack,0); // Instantaneous msg
// Start receiving data
MODE_RX();
if(p->HasHint && !p->HasData){
@ -258,6 +256,11 @@ static void obs_node(std::vector<std::string> args) {
}
}
else {
// Inform the sender that we do not want to abort
Payload *ack=new Payload();
ack->Abort=false;
m_ded->put(ack,0); // Instantaneous msg
if(i.extended){
p=m_ded->get<Payload>(); // Fetch data until sended
}
@ -298,7 +301,6 @@ static void obs_node(std::vector<std::string> args) {
} while(p->HisForward); // Ignore forwarded hint
simgrid::s4u::Mailbox *m_ded= simgrid::s4u::Mailbox::by_name(p->DedicatedMailbox);
// Start receiving hint from sender
MODE_RX();
if(p->HasData){
Payload *ack=new Payload();
ack->Abort=true;
@ -306,6 +308,7 @@ static void obs_node(std::vector<std::string> args) {
simgrid::s4u::this_actor::sleep_for(FOR(1));
}
else if(p->HasHint){
MODE_RX();
TRACK_UPTIME(p=m_ded->get<Payload>(uptime));
XBT_INFO("%s received a hint successfully",CNAME);
hint_forward=new Payload(*p); // Enable hint forwarding