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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 4a97f34326..7fd4187441 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-2017. 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,11 +9,9 @@
 #include <xbt/base.h>
 
 #include "network_interface.hpp"
-#include "xbt/fifo.h"
 #include "xbt/graph.h"
 
 
-
 /***********
  * Classes *
  ***********/
@@ -34,57 +31,47 @@ namespace simgrid {
  *********/
 
 namespace simgrid {
-  namespace surf {
-
-    class NetworkCm02Model : public NetworkModel {
-    public:
-      NetworkCm02Model();
-      NetworkCm02Model(void (*solve_fun)(lmm_system_t self));
-      ~NetworkCm02Model();
-      Link* createLink(const char *name, double bandwidth,  double latency, e_surf_link_sharing_policy_t policy,
-          xbt_dict_t properties) override;
-      void updateActionsStateLazy(double now, double delta) override;
-      void updateActionsStateFull(double now, double delta) override;
-      Action *communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate) override;
-      bool next_occuring_event_isIdempotent() override;
-      virtual void gapAppend(double size, const Link* link, NetworkAction* action);
-    protected:
-      bool haveGap_ = false;
-    };
-
-    /************
-     * Resource *
-     ************/
-
-    class NetworkCm02Link : public Link {
-    public:
-      NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
-          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 updateBandwidth(double value) override;
-      void updateLatency(double value) override;
-      virtual void gapAppend(double size, const Link* link, NetworkAction* action);
-    };
-
-
-    /**********
-     * Action *
-     **********/
-    class NetworkCm02Action : public NetworkAction {
-      friend Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *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_;
-    };
-
-  }
+namespace surf {
+
+class NetworkCm02Model : public NetworkModel {
+public:
+  NetworkCm02Model();
+  explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self));
+  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;
+  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,
+                  e_surf_link_sharing_policy_t policy, lmm_system_t 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;
+};
+
+/**********
+ * 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){};
+  virtual ~NetworkCm02Action() = default;
+  void updateRemainingLazy(double now) override;
+};
+}
 }
 
 #endif /* SURF_NETWORK_CM02_HPP_ */