X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19b3962253112b19308537bc2400de141c119d99..d12cd6be9ac379a370fc0ec3d643ca1dbbf9cd1f:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 9f160e4722..cd576d6e94 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2015. 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. */
@@ -13,76 +12,59 @@
 #include "xbt/graph.h"
 
 
-
 /***********
  * Classes *
  ***********/
 
 namespace simgrid {
-  namespace surf {
-
-    class XBT_PRIVATE NetworkCm02Model;
-    class XBT_PRIVATE NetworkCm02Action;
-    class XBT_PRIVATE NetworkSmpiModel;
+namespace kernel {
+namespace resource {
 
-  }
-}
+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)(lmm_system_t self));
-      virtual ~NetworkCm02Model() = default;
-      LinkImpl* createLink(const char* 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;
-      Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
-      virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action);
-
-    protected:
-      bool haveGap_ = false;
-    };
-
-    /************
-     * Resource *
-     ************/
-
-    class NetworkCm02Link : public LinkImpl {
-    public:
-      NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency,
-                      e_surf_link_sharing_policy_t policy, lmm_system_t system);
-      ~NetworkCm02Link() override;
-      void apply_event(tmgr_trace_iterator_t event, double value) override;
-      void setBandwidth(double value) override;
-      void setLatency(double value) override;
-      virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action);
-    };
-
-
-    /**********
-     * Action *
-     **********/
-    class NetworkCm02Action : public NetworkAction {
-      friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
-      friend NetworkSmpiModel;
-    public:
-      NetworkCm02Action(Model *model, double cost, bool failed)
-      : NetworkAction(model, cost, failed) {};
-      ~NetworkCm02Action() override;
-      void updateRemainingLazy(double now) override;
-    protected:
-      double senderGap_;
-    };
-
-  }
+class NetworkCm02Model : public NetworkModel {
+public:
+  explicit NetworkCm02Model(lmm::System* (*make_new_sys)(bool) = &lmm::make_new_maxmin_system);
+  virtual ~NetworkCm02Model() = default;
+  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;
+};
+
+/************
+ * Resource *
+ ************/
+
+class NetworkCm02Link : public LinkImpl {
+public:
+  NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
+                  s4u::Link::SharingPolicy policy, lmm::System* system);
+  virtual ~NetworkCm02Link() = default;
+  void apply_event(kernel::profile::Event* event, double value) override;
+  void set_bandwidth(double value) override;
+  void set_latency(double value) override;
+};
+
+/**********
+ * Action *
+ **********/
+class NetworkCm02Action : public NetworkAction {
+  friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
+
+public:
+  NetworkCm02Action(Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){};
+  virtual ~NetworkCm02Action() = default;
+  void update_remains_lazy(double now) override;
+};
 }
-
+}
+} // namespace simgrid
 #endif /* SURF_NETWORK_CM02_HPP_ */