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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 62f97f3f0a..b9c377e234 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -13,18 +13,18 @@ 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) {
 
@@ -35,7 +35,7 @@ namespace simgrid {
 
     double NetworkConstantModel::next_occuring_event(double /*now*/)
     {
-      NetworkConstantAction *action = NULL;
+      NetworkConstantAction *action = nullptr;
       double min = -1.0;
 
       ActionList *actionSet = getRunningActionSet();
@@ -51,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) {
@@ -64,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);
 
@@ -79,7 +79,7 @@ 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)
     {
       NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
 
@@ -92,31 +92,16 @@ namespace simgrid {
      **********/
     NetworkConstantAction::NetworkConstantAction(NetworkConstantModel *model_, double size, double latency)
     : NetworkAction(model_, size, false)
-    , m_latInit(latency)
+    , initialLatency_(latency)
     {
       latency_ = latency;
       if (latency_ <= 0.0) {
         stateSet_ = getModel()->getDoneActionSet();
         stateSet_->push_back(*this);
       }
-      variable_ = NULL;
     };
 
-    int NetworkConstantAction::unref()
-    {
-      refcount_--;
-      if (!refcount_) {
-        if (action_hook.is_linked())
-          stateSet_->erase(stateSet_->iterator_to(*this));
-        delete this;
-        return 1;
-      }
-      return 0;
-    }
-
-    void NetworkConstantAction::cancel()
-    {
-    }
+    NetworkConstantAction::~NetworkConstantAction() {}
 
   }
 }