X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5828869a4c6d79018e8eca27a10d0fe51979e5..1ebb8e111d904fea559e48ec193c1f7c5dee2245:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index f9904fd58d..8cfa9ff60c 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2019. 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. */
@@ -17,32 +17,26 @@
  ***********/
 
 namespace simgrid {
-  namespace surf {
+namespace kernel {
+namespace resource {
 
-    class XBT_PRIVATE NetworkCm02Model;
-    class XBT_PRIVATE NetworkCm02Action;
-    class XBT_PRIVATE NetworkSmpiModel;
-
-  }
-}
+class XBT_PRIVATE NetworkCm02Model;
+class XBT_PRIVATE NetworkCm02Action;
+class XBT_PRIVATE NetworkSmpiModel;
 
 /*********
  * Model *
  *********/
 
-namespace simgrid {
-namespace surf {
-
 class NetworkCm02Model : public NetworkModel {
 public:
-  NetworkCm02Model();
-  explicit NetworkCm02Model(void (*solve_fun)(kernel::lmm::System* self));
+  explicit NetworkCm02Model(lmm::System* (*make_new_sys)(bool) = &lmm::make_new_maxmin_system);
   virtual ~NetworkCm02Model() = default;
-  LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
-                       e_surf_link_sharing_policy_t policy) override;
-  void updateActionsStateLazy(double now, double delta) override;
-  void updateActionsStateFull(double now, double delta) override;
-  kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
+  LinkImpl* create_link(const std::string& name, double bandwidth, double latency,
+                        s4u::Link::SharingPolicy policy) override;
+  void update_actions_state_lazy(double now, double delta) override;
+  void update_actions_state_full(double now, double delta) override;
+  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
 };
 
 /************
@@ -52,11 +46,13 @@ public:
 class NetworkCm02Link : public LinkImpl {
 public:
   NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
-                  e_surf_link_sharing_policy_t policy, kernel::lmm::System* system);
+                  s4u::Link::SharingPolicy policy, lmm::System* system);
+  NetworkCm02Link(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
+                  s4u::Link::SharingPolicy policy, lmm::System* system);
   virtual ~NetworkCm02Link() = default;
-  void apply_event(tmgr_trace_event_t event, double value) override;
-  void setBandwidth(double value) override;
-  void setLatency(double value) override;
+  void apply_event(kernel::profile::Event* event, double value) override;
+  void set_bandwidth(double value) override;
+  void set_latency(double value) override;
 };
 
 /**********
@@ -64,14 +60,13 @@ public:
  **********/
 class NetworkCm02Action : public NetworkAction {
   friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
-  friend NetworkSmpiModel;
 
 public:
-  NetworkCm02Action(kernel::resource::Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){};
+  NetworkCm02Action(Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){};
   virtual ~NetworkCm02Action() = default;
-  void updateRemainingLazy(double now) override;
+  void update_remains_lazy(double now) override;
 };
 }
 }
-
+} // namespace simgrid
 #endif /* SURF_NETWORK_CM02_HPP_ */