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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index a5c4284a7f..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. */
@@ -10,103 +9,62 @@
 #include <xbt/base.h>
 
 #include "network_interface.hpp"
-#include "xbt/fifo.h"
 #include "xbt/graph.h"
 
 
-
 /***********
  * Classes *
  ***********/
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 class XBT_PRIVATE NetworkCm02Model;
 class XBT_PRIVATE NetworkCm02Action;
 class XBT_PRIVATE NetworkSmpiModel;
 
-}
-}
-
-/*********
- * Tools *
- *********/
-
-XBT_PRIVATE void net_define_callbacks(void);
-
 /*********
  * Model *
  *********/
 
-namespace simgrid {
-namespace surf {
-
 class NetworkCm02Model : public NetworkModel {
 public:
-  NetworkCm02Model();
-  ~NetworkCm02Model() { }
-  Link* createLink(const char *name,
-      double bw_initial,
-      tmgr_trace_t bw_trace,
-      double lat_initial,
-      tmgr_trace_t lat_trace,
-      int initiallyOn,
-      tmgr_trace_t state_trace,
-      e_surf_link_sharing_policy_t policy,
-      xbt_dict_t properties) override;
-  void addTraces() override;
-  void updateActionsStateLazy(double now, double delta) override;
-  void updateActionsStateFull(double now, double delta) override;
-  Action *communicate(NetCard *src, NetCard *dst,
-                               double size, double rate) override;
-  bool shareResourcesIsIdempotent() override {return true;}
-  virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
-protected:
-  bool m_haveGap = false;
+  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 Link {
+class NetworkCm02Link : public LinkImpl {
 public:
-  NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
-                             lmm_system_t system,
-                             double constraint_value,
-                             int initiallyOn,
-                             tmgr_trace_t state_trace,
-                             double metric_peak,
-                             tmgr_trace_t metric_trace,
-                             double lat_initial,
-                             tmgr_trace_t lat_trace,
-                               e_surf_link_sharing_policy_t policy);
-  void updateState(tmgr_trace_iterator_t event_type, double value, double date) override;
-  void updateBandwidth(double value, double date=surf_get_clock()) override;
-  void updateLatency(double value, double date=surf_get_clock()) override;
-  virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
-
-
+  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(NetCard *src, NetCard *dst, double size, double rate);
-  friend NetworkSmpiModel;
+  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) {};
-  void updateRemainingLazy(double now);
-protected:
-  double m_senderGap;
+  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_ */