cosmetics

[simgrid.git] / src / surf / network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 62f97f3..1310bf6 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -13,35 +13,29 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
  *********/
 void surf_network_model_init_Constant()
 {
  *********/
 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();
   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);
+  all_existing_models->push_back(surf_network_model);

 }
 
 namespace simgrid {
   namespace surf {
 }
 
 namespace simgrid {
   namespace surf {

+  Link* NetworkConstantModel::createLink(const char* name, double bw, double lat, e_surf_link_sharing_policy_t policy)
+  {

 
 

-    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;
+    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*/)
+    double NetworkConstantModel::nextOccuringEvent(double /*now*/)

     {
     {

-      NetworkConstantAction *action = NULL;

       double min = -1.0;
 
       ActionList *actionSet = getRunningActionSet();
       double min = -1.0;
 
       ActionList *actionSet = getRunningActionSet();

-      for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
-          ; it != itend ; ++it) {
-        action = static_cast<NetworkConstantAction*>(&*it);
+      for(auto it(actionSet->begin()), itend(actionSet->end()) ; it != itend ; ++it) {
+        NetworkConstantAction *action = static_cast<NetworkConstantAction*>(&*it);

         if (action->latency_ > 0 && (min < 0 || action->latency_ < min))
           min = action->latency_;
       }
         if (action->latency_ > 0 && (min < 0 || action->latency_ < min))
           min = action->latency_;
       }


@@ -51,7 +45,7 @@ namespace simgrid {
 
     void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
     {
 
     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) {
       ActionList *actionSet = getRunningActionSet();
       for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
           ; it != itend ; it=itNext) {


@@ -64,7 +58,7 @@ namespace simgrid {
             action->latency_ = 0.0;
           }
         }
             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);
 
         if (action->getMaxDuration() != NO_MAX_DURATION)
           action->updateMaxDuration(delta);
 


@@ -79,7 +73,7 @@ namespace simgrid {
       }
     }
 
       }
     }
 

-    Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst, double size, double rate)
+    Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)

     {
       NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
 
     {
       NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
 


@@ -92,31 +86,15 @@ namespace simgrid {
      **********/
     NetworkConstantAction::NetworkConstantAction(NetworkConstantModel *model_, double size, double latency)
     : NetworkAction(model_, size, false)
      **********/
     NetworkConstantAction::NetworkConstantAction(NetworkConstantModel *model_, double size, double latency)
     : NetworkAction(model_, size, false)

-    , m_latInit(latency)
+    , initialLatency_(latency)

     {
       latency_ = latency;
       if (latency_ <= 0.0) {
     {
       latency_ = latency;
       if (latency_ <= 0.0) {

-        stateSet_ = getModel()->getDoneActionSet();
+        stateSet_ = model_->getDoneActionSet();

         stateSet_->push_back(*this);
       }
         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() = default;

   }
 }
   }
 }