X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6050383ef0dc59e1ca54d02bcf6bccb993593add..bff0c1c16b4447b3503aa48d11b15243154ed51a:/src/surf/network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index e68c91d532..b9c377e234 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -13,28 +13,29 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
  *********/
 void surf_network_model_init_Constant()
 {
-  xbt_assert(surf_network_model == NULL);
+  xbt_assert(surf_network_model == nullptr);
   surf_network_model = new simgrid::surf::NetworkConstantModel();
   xbt_dynar_push(all_existing_models, &surf_network_model);
 
-  routing_model_create(NULL);
-
-  simgrid::surf::on_link.connect(netlink_parse_init);
+  routing_model_create(nullptr);
 }
 
 namespace simgrid {
   namespace surf {
 
+    NetworkConstantModel::~NetworkConstantModel() {}
+
     Link* NetworkConstantModel::createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy,
         xbt_dict_t properties) {
 
       xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
           "Please remove any link from your platform (and switch to routing='None')", name);
+      return nullptr;
     }
 
     double NetworkConstantModel::next_occuring_event(double /*now*/)
     {
-      NetworkConstantAction *action = NULL;
+      NetworkConstantAction *action = nullptr;
       double min = -1.0;
 
       ActionList *actionSet = getRunningActionSet();
@@ -50,7 +51,7 @@ namespace simgrid {
 
     void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
     {
-      NetworkConstantAction *action = NULL;
+      NetworkConstantAction *action = nullptr;
       ActionList *actionSet = getRunningActionSet();
       for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
           ; it != itend ; it=itNext) {
@@ -63,7 +64,7 @@ namespace simgrid {
             action->latency_ = 0.0;
           }
         }
-        action->updateRemains(action->getCost() * delta / action->m_latInit);
+        action->updateRemains(action->getCost() * delta / action->initialLatency_);
         if (action->getMaxDuration() != NO_MAX_DURATION)
           action->updateMaxDuration(delta);
 
@@ -78,40 +79,29 @@ namespace simgrid {
       }
     }
 
-    Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
-        double size, double rate)
+    Action *NetworkConstantModel::communicate(routing::NetCard *src, routing::NetCard *dst, double size, double rate)
     {
-      char *src_name = src->name();
-      char *dst_name = dst->name();
-
-      XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
       NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
-      XBT_OUT();
 
-      networkCommunicateCallbacks(action, src, dst, size, rate);
+      Link::onCommunicate(action, src, dst);
       return action;
     }
 
     /**********
      * Action *
      **********/
-
-    int NetworkConstantAction::unref()
+    NetworkConstantAction::NetworkConstantAction(NetworkConstantModel *model_, double size, double latency)
+    : NetworkAction(model_, size, false)
+    , initialLatency_(latency)
     {
-      m_refcount--;
-      if (!m_refcount) {
-        if (action_hook.is_linked())
-          p_stateSet->erase(p_stateSet->iterator_to(*this));
-        delete this;
-        return 1;
+      latency_ = latency;
+      if (latency_ <= 0.0) {
+        stateSet_ = getModel()->getDoneActionSet();
+        stateSet_->push_back(*this);
       }
-      return 0;
-    }
+    };
 
-    void NetworkConstantAction::cancel()
-    {
-      return;
-    }
+    NetworkConstantAction::~NetworkConstantAction() {}
 
   }
 }