diff options
Diffstat (limited to 'src/simulator.cc')
| -rw-r--r-- | src/simulator.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/simulator.cc b/src/simulator.cc index c3d961d..6b3e5b0 100644 --- a/src/simulator.cc +++ b/src/simulator.cc @@ -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); }
\ No newline at end of file |