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

Cleaning

Browse source
This commit is contained in:
Loic Guegan 2021-05-21 11:45:30 +02:00
parent 9535a039fe
commit 659ad990e8
6 changed files with 1848 additions and 1865 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: 270 KiB

After

Width:  |  Height:  |  Size: 226 KiB

3669
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: 184 KiB

After

Width:  |  Height:  |  Size: 158 KiB

12
results/tables-energy.org
View file

@ -4,7 +4,7 @@
|baseline |lora | 60| 16.20871| 585.2851|
|extended |lora | 60| 109.94211| 642.2070|
|hint |lora | 60| 43.05886| 585.6350|
|hintandextended |lora | 60| 2405.30785| 976.6508|
|hintandextended |lora | 60| 2515.09999| 998.2392|
|simkey |wireless | wakeupfor| sd| energy|
@ -12,22 +12,22 @@
|baseline |nbiot | 60| 59.68490| 608.9268|
|extended |nbiot | 60| 57.68462| 607.3198|
|hint |nbiot | 60| 2443.87299| 965.7313|
|hintandextended |nbiot | 60| 2951.47514| 1244.9661|
|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| 4594.7155| 3471.967|
|hintandextended |lora | 180| 4061.4263| 3567.117|
|hint |lora | 180| 4645.6128| 3485.132|
|hintandextended |lora | 180| 4064.7439| 3574.090|
|simkey |wireless | wakeupfor| sd| energy|
|:---------------|:--------|---------:|---------:|--------:|
|baseline |nbiot | 180| 226.2301| 1830.006|
|extended |nbiot | 180| 196.1743| 1809.083|
|hint |nbiot | 180| 4005.7116| 3803.885|
|hintandextended |nbiot | 180| 3656.4268| 3569.741|
|hint |nbiot | 180| 4005.7292| 3803.934|
|hintandextended |nbiot | 180| 3656.4500| 3569.778|

12
results/tables-stats.org
View file

@ -4,7 +4,7 @@
|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| 994.2061| 975.0208| 2076.70| 2400.395| 0|
|hintandextended |lora | 60| 1.844347| 5.82| 993.9211| 998.6402| 2076.32| 2459.463| 0|
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| receiverEnergy| senderUptime| receiverUptime| nSendFail|
@ -12,22 +12,22 @@
|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.053108| 6.13| 866.5263| 1280.5338| 1466.499| 3146.335| 0|
|hintandextended |nbiot | 60| 2.074472| 6.14| 865.7780| 1312.0423| 1465.718| 3225.193| 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.1126331| 3.22| 2104.610| 3633.976| 4319.890| 8979.906| 0|
|hintandextended |lora | 180| 0.7009373| 10.56| 2205.471| 3691.582| 4487.085| 9102.419| 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|
|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.672| 4319.890| 9173.079| 0|
|hintandextended |nbiot | 180| 0.6620293| 10.69| 3156.079| 3607.484| 4331.405| 8585.471| 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|

20
src/simulator.cc
View file

@ -43,7 +43,7 @@
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,i.hint_size,uptime)); \
SEND(m_ded->put(hint_forward,0,uptime)); \
} \
catch(...){ \
XBT_INFO("%s fail to forward a hint",CNAME); \
@ -57,8 +57,6 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(simulator, "[DAO] Loosely Coupled DSS");
/// @brief For convenience sake
typedef unsigned int u32;
u32 nON;
bool *data_ready;
/**
* Data that will be exchange between the nodes
@ -80,13 +78,6 @@ public:
/// @brief Observation node code
static void obs_node(std::vector<std::string> args);
bool is_data_rcv_ready(){
for(int i=0;i<nON;i++){
if(data_ready[i])
return true;
}
return false;
}
/**
* No arguments are require (cf inputs.json)
@ -105,15 +96,12 @@ int main(int argc, char **argv) {
XBT_INFO("-------------------------------------------------");
// Init all nodes actors
nON=simgrid::s4u::Engine::get_instance()->get_host_count();
data_ready=(bool*)malloc(sizeof(bool)*nON);
u32 nON=simgrid::s4u::Engine::get_instance()->get_host_count();
for(u32 i=0;i<nON;i++){
std::vector<std::string> args;
std::ostringstream ss;
ss<< "on" <<i;
args.push_back(std::to_string(i));
data_ready[i]=false;
simgrid::s4u::Actor::create("obs_node", simgrid::s4u::Host::by_name(ss.str()), obs_node, args);
simgrid::s4u::Actor::create("ON", simgrid::s4u::Host::by_name(ss.str()), obs_node, args);
}
// Launch the simulation
@ -129,7 +117,6 @@ int main(int argc, char **argv) {
static void obs_node(std::vector<std::string> args) {
// Init various variables
std::string selfName = simgrid::s4u::this_actor::get_host()->get_name();
int id=stoi(args[0]);
simgrid::s4u::this_actor::get_host()->turn_on();
Inputs i(selfName);
simgrid::s4u::Mailbox *m = simgrid::s4u::Mailbox::by_name("medium");
@ -294,7 +281,6 @@ static void obs_node(std::vector<std::string> args) {
XBT_INFO("%s could not receive any data",CNAME);
nRcvFail++;
}
data_ready[id]=false;
}
forward_mode=!forward_mode; // Toggle mode (go back and forth between receiving and forwarding)
}