$ ns3/ns3 ${srcdir:=.}/examples/platforms/clusters_routing_full.xml ${srcdir:=.}/examples/msg/ns3/Two_clusters-d.xml --cfg=network/model:NS3
> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
-> [node-16.acme.org:slave:(2) 0.012729] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-3.acme.org to c-16.me
+> [c-16.me:slave:(2) 0.012729] [msg_test/INFO] FLOW[1] : Receive 100 bytes from c-3.me to c-16.me
do {
ns3_simulator(now);
time_to_next_flow_completion = ns3_time() - surf_get_clock();//FIXME: use now instead ?
- } while(double_equals(time_to_next_flow_completion, 0));
+ } while(double_equals(time_to_next_flow_completion, 0, sg_surf_precision));
XBT_DEBUG("min : %f", now);
XBT_DEBUG("ns3 time : %f", ns3_time());
/* If there are no running flows, just return */
if (!getRunningActionSet()->size()) {
- while(double_positive(now-ns3_time())) {
+ while(double_positive(now-ns3_time(), sg_surf_precision)) {
ns3_simulator(now-ns3_time());
}
return;
{
///> ~OUL creates a 32 bit mask
///> 2^Plog - 1
- return pLog < 32 ? ((1 << pLog) - 1) : ~0UL;
+ return pLog < 32 ? ((1 << pLog) - 1) : (uint32_t) ~0UL;
}
if (idleTime > m_scellMax)
{
- idleTime = m_scellMax;
+ idleTime = m_scellMax;
}
NS_LOG_DEBUG ("\t idleTime=" << idleTime);
{
packetSize= p->GetSize ();
m_packets.erase(iter);
- m_bytesInQueue -= packetSize;
+ m_bytesInQueue -= packetSize;
return 1;
}
}