rename simgrid::kernel::model into simgrid::kernel::resource

[simgrid.git] / src / surf / network_interface.hpp

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index d4ab529..b17ddad 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
@@ -8,6 +8,7 @@
 
 #include "simgrid/s4u/Link.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
+#include "src/kernel/model/Resource.hpp"
 #include "src/surf/PropertyHolder.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "xbt/base.h"
@@ -113,9 +114,9 @@ public:
  * @brief SURF network link interface class
  * @details A Link represents the link between two [hosts](\ref simgrid::surf::HostImpl)
  */
-class LinkImpl : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder {
+class LinkImpl : public simgrid::kernel::resource::Resource, public simgrid::surf::PropertyHolder {
 protected:
-  LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, lmm_constraint_t constraint);
+  LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, kernel::lmm::Constraint* constraint);
   ~LinkImpl() override;
 
 public:
@@ -140,7 +141,7 @@ public:
   virtual void setLatency(double value) = 0;
 
   /** @brief The sharing policy is a @{link e_surf_link_sharing_policy_t::EType} (0: FATPIPE, 1: SHARED, 2:
-   * FULLDUPLEX) */
+   * SPLITDUPLEX) */
   virtual int sharingPolicy();
 
   /** @brief Check if the Link is used */
@@ -159,8 +160,8 @@ public:
                                    Trace must contain absolute values */
 
   tmgr_trace_event_t stateEvent_    = nullptr;
-  s_surf_metric_t latency_          = {1.0, 0, nullptr};
-  s_surf_metric_t bandwidth_        = {1.0, 0, nullptr};
+  Metric latency_                   = {1.0, 0, nullptr};
+  Metric bandwidth_                 = {1.0, 0, nullptr};
 
   /* User data */
   void* getData() { return userData; }
@@ -204,7 +205,7 @@ public:
    * @param failed [description]
    * @param var The lmm variable associated to this Action if it is part of a LMM component
    */
-  NetworkAction(simgrid::surf::Model* model, double cost, bool failed, lmm_variable_t var)
+  NetworkAction(simgrid::surf::Model* model, double cost, bool failed, kernel::lmm::Variable* var)
       : simgrid::surf::Action(model, cost, failed, var){};
 
   void setState(simgrid::surf::Action::State state) override;