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-20 11:13:19 +02:00
parent 404eb004ad
commit a342ca0c89
6 changed files with 3228 additions and 3223 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: 254 KiB

After

Width:  |  Height:  |  Size: 249 KiB

6364
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: 182 KiB

After

Width:  |  Height:  |  Size: 188 KiB

30
results/tables-energy.org
View file

@ -1,33 +1,33 @@
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|----------:|---------:|
|baseline |lora | 60| 16.92769| 585.6019|
|baseline |lora | 60| 16.93828| 585.7987|
|extended |lora | 60| 4396.48015| 2901.8214|
|hint |lora | 60| 113.53973| 679.6186|
|hintandextended |lora | 60| 127.91993| 653.7694|
|hint |lora | 60| 113.61249| 679.9324|
|hintandextended |lora | 60| 127.91979| 653.7922|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|----------:|---------:|
|baseline |nbiot | 60| 62.63811| 609.8635|
|extended |nbiot | 60| 8263.33831| 4860.8439|
|hint |nbiot | 60| 120.26490| 665.7586|
|hintandextended |nbiot | 60| 123.07025| 628.0724|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|---------:|---------:|
|baseline |nbiot | 60| 65.4062| 613.2213|
|extended |nbiot | 60| 8263.3383| 4860.8439|
|hint |nbiot | 60| 120.6206| 667.5331|
|hintandextended |nbiot | 60| 122.1119| 626.9545|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|----------:|--------:|
|baseline |lora | 180| 95.30832| 1791.473|
|baseline |lora | 180| 96.24996| 1797.365|
|extended |lora | 180| 3775.92822| 4470.672|
|hint |lora | 180| 210.00079| 2069.611|
|hintandextended |lora | 180| 167.16495| 1865.962|
|hint |lora | 180| 209.55557| 2069.933|
|hintandextended |lora | 180| 167.57725| 1864.873|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|---------:|--------:|
|baseline |nbiot | 180| 221.4437| 1828.990|
|baseline |nbiot | 180| 287.1412| 1902.883|
|extended |nbiot | 180| 7184.9505| 6944.547|
|hint |nbiot | 180| 371.6943| 2031.829|
|hintandextended |nbiot | 180| 356.9851| 2010.894|
|hint |nbiot | 180| 336.6721| 2009.567|
|hintandextended |nbiot | 180| 353.9554| 1983.746|

34
results/tables-stats.org
View file

@ -1,33 +1,33 @@
|simkey |wireless | wakeupfor| sd_success| success| hint_added| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|----------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |lora | 60| 0.000000| 0.00| 0.0000000| 633.8784| 581.2131| 1440.000| 1439.978| 28.64|
|baseline |lora | 60| 0.000000| 0.00| 0.0000000| 633.8784| 581.4278| 1440.000| 1439.978| 32.48|
|extended |lora | 60| 1.443352| 4.72| 0.0000000| 907.5632| 3096.5731| 1954.700| 5935.148| 20.24|
|hint |lora | 60| 0.000000| 0.00| 2.9563636| 784.7349| 670.0625| 1440.000| 1614.415| 28.08|
|hintandextended |lora | 60| 1.462595| 6.06| 0.0781818| 1015.8779| 620.8504| 2111.888| 1513.428| 81.36|
|hint |lora | 60| 0.000000| 0.00| 2.9563636| 784.7349| 670.4049| 1440.000| 1614.415| 28.96|
|hintandextended |lora | 60| 1.462595| 6.06| 0.0781818| 1015.8779| 620.8753| 2111.888| 1513.428| 28.18|
|simkey |wireless | wakeupfor| sd_success| success| hint_added| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|--------:|----------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |nbiot | 60| 1.470804| 2.200000| 0.0000000| 793.1130| 593.2044| 1440.000| 1439.978| 27.16|
|baseline |nbiot | 60| 1.152814| 1.240000| 0.0000000| 800.1330| 596.2294| 1440.000| 1439.978| 30.70|
|extended |nbiot | 60| 1.518458| 5.020000| 0.0000000| 777.2571| 5259.6316| 1467.477| 5887.267| 23.54|
|hint |nbiot | 60| 1.710440| 7.086957| 0.9277978| 993.5199| 638.5437| 1440.000| 1494.750| 35.94|
|hintandextended |nbiot | 60| 1.607689| 6.395833| 0.1358696| 878.6447| 606.2835| 1476.821| 1457.098| 127.72|
|simkey |wireless | wakeupfor| sd_success| success| hint_added| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|----------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |lora | 180| 1.4906511| 1.6800| 0.0000000| 2087.163| 1764.592| 4319.780| 4317.385| 33.36|
|extended |lora | 180| 1.1952286| 8.8000| 0.0000000| 2133.163| 4701.196| 4711.300| 9595.870| 21.04|
|hint |lora | 180| 0.4140393| 9.8000| 3.4136752| 2246.327| 2065.080| 4319.533| 4904.643| 19.78|
|hintandextended |lora | 180| 0.8139410| 9.5625| 0.5077187| 2371.051| 1852.100| 4773.883| 4473.792| 758.58|
|hint |nbiot | 60| 1.754084| 7.108696| 0.9404332| 994.3676| 640.3953| 1440.000| 1495.508| 45.68|
|hintandextended |nbiot | 60| 1.607689| 6.395833| 0.1159420| 874.4999| 605.4288| 1476.819| 1455.902| 33.84|
|simkey |wireless | wakeupfor| sd_success| success| hint_added| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|--------:|----------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |nbiot | 180| 1.1004434| 8.804878| 0.0000000| 2539.220| 1776.898| 4319.732| 4317.428| 23.92|
|baseline |lora | 180| 1.1752551| 1.080000| 0.0000000| 2094.030| 1770.395| 4319.780| 4317.385| 43.28|
|extended |lora | 180| 1.1952286| 8.800000| 0.0000000| 2133.163| 4701.196| 4711.300| 9595.870| 21.04|
|hint |lora | 180| 0.3631365| 9.857143| 3.4112628| 2245.385| 2065.741| 4319.500| 4904.259| 47.04|
|hintandextended |lora | 180| 0.8139410| 9.562500| 0.4991424| 2369.251| 1851.030| 4773.883| 4472.729| 53.20|
|simkey |wireless | wakeupfor| sd_success| success| hint_added| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|--------:|----------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |nbiot | 180| 1.4359926| 6.979592| 0.0000000| 2777.687| 1825.088| 4319.776| 4317.390| 32.24|
|extended |nbiot | 180| 1.1241323| 8.960000| 0.0000000| 2450.170| 7388.655| 4337.550| 9642.147| 23.90|
|hint |nbiot | 180| 0.4696682| 9.705882| 0.7667238| 3491.606| 1989.262| 4320.000| 4446.925| 30.64|
|hintandextended |nbiot | 180| 0.4472136| 9.750000| 0.6037736| 3394.721| 1972.916| 4333.656| 4424.966| 1191.82|
|hint |nbiot | 180| 0.6333237| 9.642857| 0.6962457| 3445.563| 1975.260| 4320.000| 4434.560| 67.90|
|hintandextended |nbiot | 180| 0.6063391| 9.647059| 0.4914089| 3328.208| 1944.475| 4334.321| 4406.019| 68.68|

23
src/simulator.cc
View file

@ -153,6 +153,7 @@ static void obs_node(std::vector<std::string> args) {
double upsince=simgrid::s4u::Engine::get_clock();
double upuntil=i.GetTS()+i.GetDuration();
bool forward_mode=false;
bool onlyf=false;
while(uptime>0)
{
if(i.is_sender){
@ -178,16 +179,18 @@ static void obs_node(std::vector<std::string> args) {
}
MODE_TX();
// Then try sending the data
if(i.extended){
if(is_data_rcv_ready()){
SEND(m_ded->put(p,i.data_size));
if(is_data_rcv_ready()){
if(i.extended){
SEND(m_ded->put(p,i.data_size));
}
else{
SEND(m_ded->put(p,i.data_size,uptime));
}
else
throw "Attemps to send when no receiver available in extended mode";
}
else{
SEND(m_ded->put(p,i.data_size,uptime));
}
else
throw "Attemps to send when no receiver available in extended mode";
// If we reach here, data has been sent successfully
XBT_INFO("%s sent data successfully",CNAME);
nSend++;
@ -272,7 +275,8 @@ static void obs_node(std::vector<std::string> args) {
if(i.use_hint){
double try_for=forward_mode ? 1 : 1;
try_for=try_for>uptime ? uptime : try_for;
if(onlyf)
forward_mode=true;
if(forward_mode && hint_forward!=NULL && CLOCK < hint_forward->hint){
FORWARD_HINT(try_for);
}
@ -284,6 +288,7 @@ 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
onlyf=true;
MODE_RX();
if(p->HasHint){
TRACK_UPTIME(p=m_ded->get<Payload>(uptime));