X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f3527d281baac664d10ce7086e0d0138e1389d7..9caf173e476622d309cc5653a83d224d05787cc7:/src/surf/network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 59da83b254..d843caa6fc 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -7,7 +6,7 @@
 #include <algorithm>
 
 #include "network_interface.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
 
 #ifndef NETWORK_INTERFACE_CPP_
 #define NETWORK_INTERFACE_CPP_
@@ -81,11 +80,11 @@ namespace simgrid {
       return rate;
     }
 
-    double NetworkModel::nextOccuringEventFull(double now)
+    double NetworkModel::next_occuring_event_full(double now)
     {
-      double minRes = Model::nextOccuringEventFull(now);
+      double minRes = Model::next_occuring_event_full(now);
 
-      for (Action const& action : *getRunningActionSet()) {
+      for (kernel::resource::Action const& action : *get_running_action_set()) {
         const NetworkAction& net_action = static_cast<const NetworkAction&>(action);
         if (net_action.latency_ > 0)
           minRes = (minRes < 0) ? net_action.latency_ : std::min(minRes, net_action.latency_);
@@ -132,9 +131,9 @@ namespace simgrid {
       }
     }
 
-    bool LinkImpl::isUsed()
+    bool LinkImpl::is_used()
     {
-      return model()->getMaxminSystem()->constraint_used(constraint());
+      return model()->get_maxmin_system()->constraint_used(constraint());
     }
 
     double LinkImpl::latency()
@@ -168,17 +167,17 @@ namespace simgrid {
     }
     void LinkImpl::setStateTrace(tmgr_trace_t trace)
     {
-      xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", getCname());
+      xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", get_cname());
       stateEvent_ = future_evt_set->add_trace(trace, this);
     }
     void LinkImpl::setBandwidthTrace(tmgr_trace_t trace)
     {
-      xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", getCname());
+      xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", get_cname());
       bandwidth_.event = future_evt_set->add_trace(trace, this);
     }
     void LinkImpl::setLatencyTrace(tmgr_trace_t trace)
     {
-      xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", getCname());
+      xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", get_cname());
       latency_.event = future_evt_set->add_trace(trace, this);
     }
 
@@ -187,9 +186,9 @@ namespace simgrid {
      * Action *
      **********/
 
-    void NetworkAction::setState(Action::State state)
+    void NetworkAction::set_state(Action::State state)
     {
-      Action::setState(state);
+      Action::set_state(state);
       s4u::Link::onCommunicationStateChange(this);
     }
 
@@ -197,12 +196,13 @@ namespace simgrid {
     std::list<LinkImpl*> NetworkAction::links()
     {
       std::list<LinkImpl*> retlist;
-      int llen = getVariable()->get_number_of_constraint();
+      int llen = get_variable()->get_number_of_constraint();
 
       for (int i = 0; i < llen; i++) {
         /* Beware of composite actions: ptasks put links and cpus together */
         // extra pb: we cannot dynamic_cast from void*...
-        Resource* resource = static_cast<Resource*>(getVariable()->get_constraint(i)->get_id());
+        kernel::resource::Resource* resource =
+            static_cast<kernel::resource::Resource*>(get_variable()->get_constraint(i)->get_id());
         LinkImpl* link     = dynamic_cast<LinkImpl*>(resource);
         if (link != nullptr)
           retlist.push_back(link);