loic/loosely-coupled-dss-extended
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/loosely-coupled-dss-extended.git synced 2025-06-26 23:37:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve data analysis and simulation

Browse source
This commit is contained in:
Loic Guegan 2021-05-11 08:53:11 +02:00
parent 9c9be6752d
commit 1477290330
12 changed files with 38487 additions and 19293 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Inputs.cc
View file

@ -18,6 +18,7 @@ Inputs::Inputs(std::string node_name){
data_size=d["nodes"][node_name.c_str()]["data_size"].GetInt();
extended=d["extended"].GetBool();
seed=d["seed"].GetInt();
hint_size=d["hint_size"].GetInt();
n_nodes=d["nodes"].MemberCount();
// Instantiate wake_ts

1
src/Inputs.hpp
View file

@ -77,6 +77,7 @@ public:
bool use_hint;
bool extended;
int data_size;
int hint_size;
int seed;
int n_nodes;
};

6
src/scenarios.cc
View file

@ -17,10 +17,10 @@ using namespace rapidjson;
int main(int argc, char **argv){
// Setup seed
if(argc!=14){
if(argc!=15){
cerr << "Usage: " << argv[0] <<
" <seed> <simtime> <wakeupevery> <wakeupfor> <n_nodes>" <<
" <extended> <hint> <poff> <pon> <prx> <ptx> <datasize> <bitrate>" <<
" <extended> <hint> <poff> <pon> <prx> <ptx> <datasize> <bitrate> <hintsize>" <<
endl;
exit(1);
}
@ -39,6 +39,7 @@ int main(int argc, char **argv){
double ptx=stod(argv[11]);
unsigned int datasize=atoi(argv[12]);
string bitrate(argv[13]);
unsigned int hintsize=atoi(argv[14]);
// Setup seed
@ -52,6 +53,7 @@ int main(int argc, char **argv){
simkeyValue.SetString(bitrate.c_str(),bitrate.size(),d.GetAllocator());
d.AddMember("bitrate",simkeyValue,d.GetAllocator());
d.AddMember("extended",extended,d.GetAllocator());
d.AddMember("hint_size",hintsize,d.GetAllocator());
// Create nodes
Value nodes(kObjectType);

11
src/simulator.cc
View file

@ -27,9 +27,10 @@ typedef unsigned int u32;
*/
class Payload{
public:
Payload():hint(0),duration(0),containsHint(false){}
Payload():hint(0),duration(0),containsHint(false),size(0){}
double hint;
double duration;
int size;
bool containsHint;
std::string node;
};
@ -109,10 +110,12 @@ static void obs_node(std::vector<std::string> args) {
if(isSender){ // If I am a sender
Payload *p=new Payload();
p->node=selfName;
p->size=data_size;
if(useHint&&i.HasNext()){
p->containsHint=true;
p->hint=i.GetNextTS();
p->duration=i.GetNextDuration();
p->size=data_size+i.hint_size;
}
if(i.extended){
// We use a trick here
@ -124,11 +127,11 @@ static void obs_node(std::vector<std::string> args) {
m->put(p,0,uptime);
simgrid::s4u::Mailbox *m_ext= simgrid::s4u::Mailbox::by_name("medium"+selfName);
MODE_TX();
m_ext->put(p,data_size);
m_ext->put(p,p->size);
}
else{
MODE_TX();
m->put(p,data_size,uptime);
m->put(p,p->size,uptime);
}
nSend++;
isSender=(nSend<(i.n_nodes-1));
@ -186,5 +189,5 @@ static void obs_node(std::vector<std::string> args) {
}
// Done
MODE_OFF()
XBT_INFO("Observation node %s finished [LOG2PARSE](node:%s|nSend:%d|nWakeUp:%d|nDataRcv:%d|nSendFail:%d|nRcvFail:%d|totalUptime:%f|seed:%d)",selfName.c_str(),selfName.c_str(),nSend,nWakeUp,nDataRcv,nSendFail,nRcvFail,totalUptime,i.seed);
XBT_INFO("Observation node %s finished [LOG2PARSE](node:%s|isSender:%d|nSend:%d|nWakeUp:%d|nDataRcv:%d|nSendFail:%d|nRcvFail:%d|totalUptime:%f|seed:%d)",selfName.c_str(),selfName.c_str(),i.is_sender,nSend,nWakeUp,nDataRcv,nSendFail,nRcvFail,totalUptime,i.seed);
}