X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/218cfca134c987a5f4df49044ba61673883f3aed..c1139d8e995d20f3afebc6cb69c66c155348dbdd:/src/surf/network_ns3.cpp?ds=sidebyside

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 8dac14b7e7..16f288d66f 100644
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -21,12 +21,12 @@
 #include "network_ns3.hpp"
 #include "ns3/ns3_simulator.hpp"
 
-#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
-#include "src/kernel/routing/NetPoint.hpp"
-
+#include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/plugins/energy.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/NetZone.hpp"
+#include "src/surf/xml/platf_private.hpp"
+#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module");
 
@@ -62,7 +62,7 @@ NetPointNs3::NetPointNs3()
  * Callbacks *
  *************/
 
-static void clusterCreation_cb(ClusterCreationArgs* cluster)
+static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs* cluster)
 {
   for (int const& i : *cluster->radicals) {
     // Routers don't create a router on the other end of the private link by themselves.
@@ -175,7 +175,7 @@ LinkImpl* NetworkNS3Model::createLink(const std::string& name, double bandwidth,
   return new LinkNS3(this, name, bandwidth, latency);
 }
 
-Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
+kernel::resource::Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
 {
   return new NetworkNS3Action(this, size, src, dst);
 }
@@ -223,8 +223,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta)
     XBT_DEBUG("Processing socket %p (action %p)",sgFlow,action);
     action->setRemains(action->getCost() - sgFlow->sentBytes_);
 
-    if (TRACE_is_enabled() &&
-        action->getState() == Action::State::running){
+    if (TRACE_is_enabled() && action->getState() == kernel::resource::Action::State::running) {
       double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_;
 
       std::vector<LinkImpl*> route = std::vector<LinkImpl*>();
@@ -240,7 +239,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta)
     if(sgFlow->finished_){
       socket_to_destroy.push_back(ns3Socket);
       XBT_DEBUG("Destroy socket %p of action %p", ns3Socket.c_str(), action);
-      action->finish(Action::State::done);
+      action->finish(kernel::resource::Action::State::done);
     } else {
       XBT_DEBUG("Socket %p sent %u bytes out of %u (%u remaining)", ns3Socket.c_str(), sgFlow->sentBytes_,
                 sgFlow->totalBytes_, sgFlow->remaining_);
@@ -289,7 +288,7 @@ void LinkNS3::setLatencyTrace(tmgr_trace_t trace) {
  * Action *
  **********/
 
-NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* src, s4u::Host* dst)
+NetworkNS3Action::NetworkNS3Action(kernel::resource::Model* model, double totalBytes, s4u::Host* src, s4u::Host* dst)
     : NetworkAction(model, totalBytes, false)
 {
   XBT_DEBUG("Communicate from %s to %s", src->getCname(), dst->getCname());
@@ -310,7 +309,7 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s
   xbt_assert(not addr.empty(), "Element %s is unknown to NS3. Is it connected to any one-hop link?",
              dst->pimpl_netpoint->getCname());
 
-  XBT_DEBUG("ns3_create_flow %.0f Bytes from %u to %u with Interface %s", totalBytes, node1, node2, addr.c_str());
+  XBT_DEBUG("ns3: Create flow of %.0f Bytes from %u to %u with Interface %s", totalBytes, node1, node2, addr.c_str());
   ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress(ns3::Ipv4Address::GetAny(), port_number));
   sink.Install(dst_node);
 
@@ -340,6 +339,10 @@ std::list<LinkImpl*> NetworkNS3Action::links()
 {
   THROW_UNIMPLEMENTED;
 }
+void NetworkNS3Action::updateRemainingLazy(double /*now*/)
+{
+  THROW_IMPOSSIBLE;
+}
 
 /* Test whether a flow is suspended */
 bool NetworkNS3Action::isSuspended()
@@ -351,8 +354,8 @@ int NetworkNS3Action::unref()
 {
   refcount_--;
   if (not refcount_) {
-    if (action_hook.is_linked())
-      simgrid::xbt::intrusive_erase(*stateSet_, *this);
+    if (stateSetHook_.is_linked())
+      simgrid::xbt::intrusive_erase(*state_set_, *this);
     XBT_DEBUG ("Removing action %p", this);
     delete this;
     return 1;