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

Debug

Browse source
This commit is contained in:
Loic Guegan 2021-05-21 07:56:49 +02:00
parent 1124887d0f
commit 4289a40cb3
6 changed files with 646 additions and 679 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: 244 KiB

After

Width:  |  Height:  |  Size: 250 KiB

1194
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: 151 KiB

After

Width:  |  Height:  |  Size: 162 KiB

52
results/tables-energy.org
View file

@ -1,33 +1,33 @@
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|---------:|--------:|
|baseline |lora | 60| 15.27504| 584.4667|
|extended |lora | 60| 101.64624| 637.2433|
|hint |lora | 60| 23.81539| 590.4819|
|hintandextended |lora | 60| 114.57174| 647.3442|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|----------:|---------:|
|baseline |lora | 60| 15.27504| 584.4667|
|extended |lora | 60| 101.64624| 637.2433|
|hint |lora | 60| 15.46092| 583.9662|
|hintandextended |lora | 60| 2366.74196| 1015.6809|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|----------:|---------:|
|baseline |nbiot | 60| 58.67243| 607.8669|
|extended |nbiot | 60| 56.56835| 606.4526|
|hint |nbiot | 60| 988.85630| 703.4274|
|hintandextended |nbiot | 60| 2452.53438| 1061.8793|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|----------:|--------:|
|baseline |lora | 180| 93.38861| 1788.865|
|extended |lora | 180| 110.07750| 1793.727|
|hint |lora | 180| 2837.59468| 2438.030|
|hintandextended |lora | 180| 4531.20671| 3898.169|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|---------:|--------:|
|baseline |nbiot | 60| 58.67243| 607.8669|
|extended |nbiot | 60| 56.56835| 606.4526|
|hint |nbiot | 60| 103.98681| 644.1689|
|hintandextended |nbiot | 60| 90.73858| 636.3236|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|---------:|--------:|
|baseline |lora | 180| 93.38861| 1788.865|
|extended |lora | 180| 110.07750| 1793.727|
|hint |lora | 180| 213.29475| 2056.413|
|hintandextended |lora | 180| 162.90313| 1912.700|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|--------:|--------:|
|baseline |nbiot | 180| 216.6888| 1823.300|
|extended |nbiot | 180| 184.0252| 1803.931|
|hint |nbiot | 180| 178.1057| 1944.607|
|hintandextended |nbiot | 180| 165.2183| 1906.130|
|baseline |nbiot | 180| 216.6888| 1823.300|
|extended |nbiot | 180| 184.0252| 1803.931|
|hint |nbiot | 180| 4603.8620| 3941.424|
|hintandextended |nbiot | 180| 2908.7053| 3215.115|

28
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.0| 627.136| 580.5876| 1440.000| 1440.000| 0|
|extended |lora | 60| 1.523884| 5.1| 935.920| 610.0909| 2013.400| 1495.555| 0|
|hint |lora | 60| 0.000000| 0.0| 635.440| 586.3948| 1440.000| 1451.391| 0|
|hintandextended |lora | 60| 1.505545| 5.4| 988.225| 616.3550| 2071.087| 1503.999| 0|
|baseline |lora | 60| 0.000000| 0.0| 627.1360| 580.5876| 1440.000| 1440.000| 0|
|extended |lora | 60| 1.523884| 5.1| 935.9200| 610.0909| 2013.400| 1495.555| 0|
|hint |lora | 60| 0.000000| 0.0| 625.9520| 579.7253| 1440.000| 1440.000| 0|
|hintandextended |lora | 60| 1.636392| 5.7| 986.4366| 1018.3888| 2065.408| 2508.695| 0|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |nbiot | 60| 1.418136| 1.3| 773.9900| 592.7648| 1440.000| 1440.000| 0|
|extended |nbiot | 60| 1.837873| 5.6| 776.6612| 590.9791| 1480.925| 1444.349| 0|
|hint |nbiot | 60| 3.645393| 4.2| 871.7507| 623.4796| 1440.000| 1473.591| 0|
|hintandextended |nbiot | 60| 2.299758| 8.2| 900.6131| 612.2973| 1499.987| 1459.351| 0|
|hint |nbiot | 60| 1.337493| 1.3| 786.5350| 695.1167| 1440.000| 1699.461| 0|
|hintandextended |nbiot | 60| 1.885618| 6.0| 861.1527| 1080.6388| 1471.322| 2645.565| 0|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |lora | 180| 1.100505| 0.9| 2079.000| 1762.489| 4319.300| 4317.609| 0|
|extended |lora | 180| 1.349897| 9.4| 2145.360| 1761.760| 4733.400| 4349.709| 0|
|hint |lora | 180| 2.626785| 9.3| 2182.152| 2044.983| 4319.300| 4875.818| 0|
|hintandextended |lora | 180| 0.000000| 11.0| 2275.511| 1879.717| 4842.812| 4561.617| 0|
|baseline |lora | 180| 1.1005049| 0.9| 2079.000| 1762.489| 4319.300| 4317.609| 0|
|extended |lora | 180| 1.3498971| 9.4| 2145.360| 1761.760| 4733.400| 4349.709| 0|
|hint |lora | 180| 2.6770631| 1.5| 2078.968| 2481.290| 4319.300| 6107.494| 0|
|hintandextended |lora | 180| 0.9718253| 10.5| 2171.194| 4056.607| 4464.104| 10015.506| 0|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |nbiot | 180| 1.595131| 9.1| 2511.166| 1760.766| 4319.300| 4317.609| 0|
|extended |nbiot | 180| 1.264911| 9.6| 2393.062| 1750.373| 4331.310| 4319.192| 0|
|hint |nbiot | 180| 0.000000| 11.0| 2209.184| 1920.554| 4319.300| 4465.173| 0|
|hintandextended |nbiot | 180| 0.000000| 11.0| 2176.212| 1881.578| 4341.278| 4438.185| 0|
|baseline |nbiot | 180| 1.5951315| 9.1| 2511.166| 1760.766| 4319.300| 4317.609| 0|
|extended |nbiot | 180| 1.2649111| 9.6| 2393.062| 1750.373| 4331.310| 4319.192| 0|
|hint |nbiot | 180| 0.9486833| 10.7| 3087.841| 4019.022| 4319.300| 9602.008| 0|
|hintandextended |nbiot | 180| 0.0000000| 11.0| 2978.674| 3236.609| 4324.705| 7663.807| 0|

51
src/simulator.cc
View file

@ -63,13 +63,14 @@ typedef unsigned int u32;
*/
class Payload{
public:
Payload():hint(0),duration(0),HasHint(false),HisForward(false),HasData(false),DataSize(0){}
Payload(Payload &p):hint(p.hint),duration(p.duration),HasHint(p.HasHint),DedicatedMailbox(p.DedicatedMailbox),HisForward(p.HisForward),HasData(p.HasData),DataSize(p.DataSize){}
Payload():hint(0),duration(0),HasHint(false),HisForward(false),HasData(false),DataSize(0),Abort(false){}
Payload(Payload &p):hint(p.hint),duration(p.duration),HasHint(p.HasHint),DedicatedMailbox(p.DedicatedMailbox),HisForward(p.HisForward),HasData(p.HasData),DataSize(p.DataSize),Abort(p.Abort){}
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 HasData;
bool HisForward;
bool Abort;
u32 DataSize;
std::string DedicatedMailbox; // Dedicated mailbox used by the sender/receiver
};
@ -166,7 +167,9 @@ static void obs_node(std::vector<std::string> args) {
SEND(m_ded->put(p,p->DataSize,uptime)); // Send the actual hint
XBT_INFO("%s sent a hint successfully",CNAME);
}
catch(...){}
catch(...){
}
}
// Send data if send hint mode is disable
@ -187,17 +190,23 @@ static void obs_node(std::vector<std::string> args) {
try {
TRACK_UPTIME(m->put(p,0,FOR(1)));
simgrid::s4u::Mailbox *m_ded= simgrid::s4u::Mailbox::by_name(p->DedicatedMailbox);
MODE_TX();
if(i.extended){
SEND(m_ded->put(p,p->DataSize));
Payload *ack=m_ded->get<Payload>();
if(!ack->Abort){
MODE_TX();
if(i.extended){
SEND(m_ded->put(p,p->DataSize));
}
else{
SEND(m_ded->put(p,p->DataSize,uptime));
}
XBT_INFO("%s sent data successfully",CNAME);
nSend++;
is_sender=(nSend<(i.n_nodes-1)); // Stop sending if all nodes received
isObserver=!is_sender; // Switch to observer mode if all nodes received the data
}
else{
SEND(m_ded->put(p,p->DataSize,uptime));
else {
simgrid::s4u::this_actor::sleep_for(FOR(1));
}
XBT_INFO("%s sent data successfully",CNAME);
nSend++;
is_sender=(nSend<(i.n_nodes-1)); // Stop sending if all nodes received
isObserver=!is_sender; // Switch to observer mode if all nodes received the data
}
catch(...){}
}
@ -207,8 +216,11 @@ static void obs_node(std::vector<std::string> args) {
else if(!isObserver){
// Forward hint mode
if(forward_mode){
if(hint_forward!=NULL && CLOCK < hint_forward->hint){
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
}
catch(...){}
}
}
else { // Receiving mode
@ -233,6 +245,9 @@ static void obs_node(std::vector<std::string> args) {
}
} while(p->HisForward);
simgrid::s4u::Mailbox *m_ded= simgrid::s4u::Mailbox::by_name(p->DedicatedMailbox);
Payload *ack=new Payload();
ack->Abort=false;
m_ded->put(ack,0);
// Start receiving data
MODE_RX();
if(p->HasHint && !p->HasData){
@ -285,12 +300,18 @@ 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
forward_only=true;
MODE_RX();
if(p->HasHint){
if(p->HasData){
Payload *ack=new Payload();
ack->Abort=true;
m_ded->put(ack,0);
simgrid::s4u::this_actor::sleep_for(FOR(1));
}
else if(p->HasHint){
TRACK_UPTIME(p=m_ded->get<Payload>(uptime));
XBT_INFO("%s received a hint successfully",CNAME);
hint_forward=new Payload(*p); // Enable hint forwarding
forward_only=true;
}
else {
simgrid::s4u::this_actor::sleep_for(FOR(1));