X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/957da2691fc483ae05228fc6ef815af5944452af..bde09a7b53c62986d6f22b10de50dec039b4f96a:/src/surf/ptask_L07.cpp

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index 85c2bc325b..cf22248877 100644
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -66,9 +66,9 @@ NetworkL07Model::~NetworkL07Model()
   set_maxmin_system(nullptr);
 }
 
-double HostL07Model::next_occuring_event(double now)
+double HostL07Model::next_occurring_event(double now)
 {
-  double min = HostModel::next_occuring_event_full(now);
+  double min = HostModel::next_occurring_event_full(now);
   for (kernel::resource::Action const& action : *get_started_action_set()) {
     const L07Action& net_action = static_cast<const L07Action&>(action);
     if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min)) {
@@ -119,10 +119,10 @@ void HostL07Model::update_actions_state(double /*now*/, double delta)
 
     /* Need to check that none of the model has failed */
     int i                         = 0;
-    kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i);
+    const kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i);
     while (cnst != nullptr) {
       i++;
-      kernel::resource::Resource* constraint_id = cnst->get_id();
+      const kernel::resource::Resource* constraint_id = cnst->get_id();
       if (not constraint_id->is_on()) {
         XBT_DEBUG("Action (%p) Failed!!", &action);
         action.finish(kernel::resource::Action::State::FAILED);
@@ -210,7 +210,7 @@ L07Action::L07Action(kernel::resource::Model* model, const std::vector<s4u::Host
 kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
 {
   std::vector<s4u::Host*> host_list = {src, dst};
-  double* flops_amount = new double[2]();
+  const double* flops_amount        = new double[2]();
   double* bytes_amount = new double[4]();
 
   bytes_amount[1] = size;
@@ -254,7 +254,7 @@ LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwid
   if (policy == s4u::Link::SharingPolicy::FATPIPE)
     get_constraint()->unshare();
 
-  s4u::Link::on_creation(this->piface_);
+  s4u::Link::on_creation(*get_iface());
 }
 
 kernel::resource::CpuAction* CpuL07::execution_start(double size)
@@ -288,12 +288,12 @@ bool CpuL07::is_used()
 /** @brief take into account changes of speed (either load or max) */
 void CpuL07::on_speed_change()
 {
-  kernel::lmm::Variable* var = nullptr;
+  const kernel::lmm::Variable* var;
   const kernel::lmm::Element* elem = nullptr;
 
   get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), speed_.peak * speed_.scale);
   while ((var = get_constraint()->get_variable(&elem))) {
-    kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id());
+    const kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id());
 
     get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak);
   }
@@ -362,7 +362,7 @@ void LinkL07::set_bandwidth(double value)
 
 void LinkL07::set_latency(double value)
 {
-  kernel::lmm::Variable* var = nullptr;
+  const kernel::lmm::Variable* var;
   L07Action *action;
   const kernel::lmm::Element* elem = nullptr;
 
@@ -395,7 +395,6 @@ void L07Action::updateBound()
   if (communicationAmount_ != nullptr) {
     for (size_t i = 0; i < host_count; i++) {
       for (size_t j = 0; j < host_count; j++) {
-
         if (communicationAmount_[i * host_count + j] > 0) {
           double lat = 0.0;
           std::vector<kernel::resource::LinkImpl*> route;