Also fix the ns3 log channels. What a debacle...

diff --git a/examples/s4u/network-ns3/s4u-network-ns3.tesh b/examples/s4u/network-ns3/s4u-network-ns3.tesh
index 195129f..da05c3e 100644 (file)
--- a/examples/s4u/network-ns3/s4u-network-ns3.tesh
+++ b/examples/s4u/network-ns3/s4u-network-ns3.tesh
@@ -35,7 +35,7 @@ p Dogbone
 ! timeout 10
 $ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/dogbone.xml ${srcdir}/network-ns3/dogbone_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%a(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'ns-3'
-> [:maestro(0)] [ns3/WARNING] Ignoring a route between S1 and C1 of length 3: Only routes of length 1 are considered with ns-3.
+> [:maestro(0)] [res_ns3/WARNING] Ignoring a route between S1 and C1 of length 3: Only routes of length 1 are considered with ns-3.
 > WARNING: You can ignore this warning if your hosts can still communicate when only considering routes of length 1.
 > WARNING: Remove long routes to avoid this harmless message; subsequent long routes will be silently ignored.
 > [C1:worker(3)] [s4u_test/INFO] FLOW[0] : Receive 10000 bytes from S1 to C1

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index dba91ed..7087c97 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -406,7 +406,7 @@ void NetworkNS3Model::update_actions_state(double now, double delta)
     ns3_socket = socket_to_destroy.back();
     socket_to_destroy.pop_back();
     SgFlow* flow = flow_from_sock.at(ns3_socket);
-    if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) {
+    if (XBT_LOG_ISENABLED(res_ns3, xbt_log_priority_debug)) {
       XBT_DEBUG("Removing socket %s of action %p", ns3_socket.c_str(), flow->action_);
     }
     delete flow;

diff --git a/src/surf/ns3/ns3_simulator.cpp b/src/surf/ns3/ns3_simulator.cpp
index 634fe15..f785c85 100644 (file)
--- a/src/surf/ns3/ns3_simulator.cpp
+++ b/src/surf/ns3/ns3_simulator.cpp
@@ -22,7 +22,7 @@ std::map<std::string, ns3::ApplicationContainer, std::less<>> sink_from_sock; //
 static void receive_callback(ns3::Ptr<ns3::Socket> socket);
 static void datasent_cb(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent);
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_ns3);
 
 SgFlow::SgFlow(uint32_t totalBytes, simgrid::kernel::resource::NetworkNS3Action* action)
 {

diff --git a/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.tesh b/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.tesh
index 16cb9cb..ff4e558 100644 (file)
--- a/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.tesh
+++ b/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.tesh
@@ -3,6 +3,6 @@ p We just want to check that the ns-3 bindings of SimGrid are working correctly,
 
 $ ./ns3-from-src-to-itself ${platfdir}/ns3-big-cluster.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%a(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'ns-3'
-> [:maestro(0)] [ns3/WARNING] Sending from a host c-01.rennes to itself is not supported by ns-3. Every such communication finishes immediately upon startup.
+> [:maestro(0)] [res_ns3/WARNING] Sending from a host c-01.rennes to itself is not supported by ns-3. Every such communication finishes immediately upon startup.
 > [c-01.rennes:receiver(1)] [s4u_test/INFO] Done receiving from 2 senders, each of them sending 5 messages