Debug energy

This commit is contained in:
Loic Guegan 2021-05-12 10:22:34 +02:00
parent 454d01dc84
commit 95fc03c7e0
7 changed files with 6329 additions and 6320 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 KiB

After

Width:  |  Height:  |  Size: 181 KiB

View file

@ -54,7 +54,7 @@ pon=0.4
prx=0.16
ptx=0.16
datasize=1000000 # 1Mb
hintsize=4 # Integer
hintsize=8 # Integer
latency="0ms"
bitrate="100kbps"

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 KiB

After

Width:  |  Height:  |  Size: 126 KiB

View file

@ -3,31 +3,31 @@
|:---------------|:--------|---------:|---------:|--------:|
|baseline |lora | 60| 11.42543| 582.4248|
|extended |lora | 60| 247.76639| 724.7427|
|hint |lora | 60| 141.15796| 656.7739|
|hintandextended |lora | 60| 247.76716| 724.7431|
|hint |lora | 60| 141.15912| 656.7747|
|hintandextended |lora | 60| 247.76853| 724.7439|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|---------:|--------:|
|baseline |nbiot | 60| 46.29838| 602.1441|
|extended |nbiot | 60| 101.21359| 636.9688|
|hint |nbiot | 60| 318.54242| 760.1508|
|hintandextended |nbiot | 60| 101.22569| 636.9761|
|hint |nbiot | 60| 318.63537| 760.2035|
|hintandextended |nbiot | 60| 101.24586| 636.9882|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|--------:|--------:|
|baseline |lora | 180| 79.1002| 1776.200|
|extended |lora | 180| 295.1277| 1923.262|
|hint |lora | 180| 327.1633| 2025.394|
|hintandextended |lora | 180| 295.1290| 1923.263|
|hint |lora | 180| 327.1645| 2025.396|
|hintandextended |lora | 180| 295.1311| 1923.265|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|--------:|--------:|
|baseline |nbiot | 180| 157.3624| 1827.347|
|extended |nbiot | 180| 142.5041| 1819.366|
|hint |nbiot | 180| 167.7236| 1866.050|
|hintandextended |nbiot | 180| 142.5110| 1819.371|
|hint |nbiot | 180| 167.7749| 1866.084|
|hintandextended |nbiot | 180| 142.5446| 1819.393|

View file

@ -3,31 +3,31 @@
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |lora | 60| 0.000000| 0.00| 614.6688| 579.4935| 1440.000| 1439.945| 28.41|
|extended |lora | 60| 1.598105| 5.54| 1464.4720| 657.4945| 2952.060| 1579.271| 18.46|
|hint |lora | 60| 0.000000| 0.00| 778.7375| 645.6863| 1440.000| 1568.139| 27.99|
|hintandextended |lora | 60| 1.598105| 5.54| 1464.4747| 657.4948| 2952.067| 1579.272| 18.46|
|hint |lora | 60| 0.000000| 0.00| 778.7424| 645.6868| 1440.000| 1568.139| 27.99|
|hintandextended |lora | 60| 1.598105| 5.54| 1464.4797| 657.4952| 2952.074| 1579.272| 18.46|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |nbiot | 60| 0.000000| 0.00| 732.9846| 590.2495| 1440.000| 1439.945| 28.41|
|extended |nbiot | 60| 1.591486| 5.55| 937.8329| 609.6175| 1622.902| 1458.437| 18.45|
|hint |nbiot | 60| 0.000000| 0.00| 1398.9990| 702.0737| 1440.000| 1568.139| 27.99|
|hintandextended |nbiot | 60| 1.591486| 5.55| 937.8766| 609.6215| 1623.011| 1458.446| 18.45|
|hint |nbiot | 60| 0.000000| 0.00| 1399.3148| 702.1024| 1440.000| 1568.139| 27.99|
|hintandextended |nbiot | 60| 1.591486| 5.55| 937.9493| 609.6281| 1623.013| 1458.447| 18.45|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |lora | 180| 0.0000000| 0.00| 2022.634| 1753.797| 4319.890| 4317.521| 37.05|
|extended |lora | 180| 1.2535203| 9.38| 2817.306| 1860.257| 5897.747| 4517.161| 14.03|
|hint |lora | 180| 0.1407053| 0.02| 2397.703| 1991.548| 4319.890| 4826.655| 35.11|
|hintandextended |lora | 180| 1.2535203| 9.38| 2817.311| 1860.257| 5897.758| 4517.162| 14.03|
|hint |lora | 180| 0.1407053| 0.02| 2397.710| 1991.549| 4319.890| 4826.655| 35.11|
|hintandextended |lora | 180| 1.2535203| 9.38| 2817.319| 1860.258| 5897.769| 4517.163| 14.03|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
|:---------------|:--------|---------:|----------:|-------:|------------:|--------------:|------------:|--------------:|---------:|
|baseline |nbiot | 180| 1.616956| 7.54| 2326.829| 1783.422| 4319.887| 4317.528| 27.93|
|extended |nbiot | 180| 1.157147| 9.88| 2242.672| 1795.911| 4407.490| 4330.240| 19.33|
|hint |nbiot | 180| 1.151679| 9.87| 2332.049| 1840.230| 4319.825| 4398.176| 24.25|
|hintandextended |nbiot | 180| 1.157147| 9.88| 2242.694| 1795.915| 4407.546| 4330.248| 19.33|
|hint |nbiot | 180| 1.151679| 9.87| 2332.235| 1840.255| 4319.825| 4398.176| 24.25|
|hintandextended |nbiot | 180| 1.157147| 9.88| 2242.817| 1795.931| 4407.547| 4330.248| 19.33|

View file

@ -115,6 +115,7 @@ static void obs_node(std::vector<std::string> args) {
if(i.is_sender){
Payload *p=new Payload();
p->DedicatedMailbox="dedicated"+selfName;
// Add hint informations to the payload
if(i.use_hint && i.HasNext()){
p->HasHint=i.use_hint;
p->duration=i.GetNextDuration();
@ -122,19 +123,24 @@ static void obs_node(std::vector<std::string> args) {
}
MODE_ON();
try {
TRACK_UPTIME(m->put(p,0,uptime)); // Send instantaneous message
// First we send and instantaneous message
// 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
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
MODE_TX();
if(p->HasHint){
TRACK_UPTIME(m_ded->put(p,i.hint_size,uptime));
XBT_INFO("%s sent a hint successfully",selfName.c_str());
}
// Then try sending the data
MODE_TX();
if(i.extended)
m_ded->put(p,i.data_size);
else
m_ded->put(p,i.data_size,uptime);
// If we reach here, data has been sent successfully
XBT_INFO("%s sent data successfully",selfName.c_str());
nSend++;
i.is_sender=(nSend<(i.n_nodes-1));
@ -151,18 +157,21 @@ static void obs_node(std::vector<std::string> args) {
bool hintReceived=false;
MODE_ON();
try {
TRACK_UPTIME(p=m->get<Payload>(uptime)); // Get the instantaneous message
// 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",selfName.c_str());
hintReceived=true;
}
MODE_RX();
if(i.extended)
p=m_ded->get<Payload>(); // Fetch data
p=m_ded->get<Payload>(); // Fetch data until sended
else
p=m_ded->get<Payload>(uptime); // Fetch data
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",selfName.c_str());
nDataRcv++;
isObserver=true;