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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index ff805e4a22..4020ec6e09 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -1,93 +1,88 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. 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. */
 
+#ifndef SURF_NETWORK_CM02_HPP_
+#define SURF_NETWORK_CM02_HPP_
+
+#include <xbt/base.h>
+
 #include "network_interface.hpp"
-#include "xbt/fifo.h"
 #include "xbt/graph.h"
 
-#ifndef SURF_NETWORK_CM02_HPP_
-#define SURF_NETWORK_CM02_HPP_
+
 
 /***********
  * Classes *
  ***********/
-class NetworkCm02Model;
-class NetworkCm02Action;
 
-/*********
- * Tools *
- *********/
+namespace simgrid {
+  namespace surf {
 
-void net_define_callbacks(void);
+    class XBT_PRIVATE NetworkCm02Model;
+    class XBT_PRIVATE NetworkCm02Action;
+    class XBT_PRIVATE NetworkSmpiModel;
+
+  }
+}
 
 /*********
  * Model *
  *********/
-class NetworkCm02Model : public NetworkModel {
-private:
-  void initialize();
-public:
-  NetworkCm02Model(int /*i*/) : NetworkModel() {
-	f_networkSolve = lmm_solve;
-	m_haveGap = false;
-  };//FIXME: add network clean interface
-  NetworkCm02Model();
-  ~NetworkCm02Model() {
+
+namespace simgrid {
+  namespace surf {
+
+    class NetworkCm02Model : public NetworkModel {
+    public:
+      NetworkCm02Model();
+      explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self));
+      virtual ~NetworkCm02Model();
+      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_;
+    };
+
   }
-  Link* createLink(const char *name,
-		  double bw_initial,
-		  tmgr_trace_t bw_trace,
-		  double lat_initial,
-		  tmgr_trace_t lat_trace,
-		  e_surf_resource_state_t state_initial,
-		  tmgr_trace_t state_trace,
-		  e_surf_link_sharing_policy_t policy,
-		  xbt_dict_t properties);
-  void addTraces();
-  void updateActionsStateLazy(double now, double delta);
-  void updateActionsStateFull(double now, double delta);
-  Action *communicate(RoutingEdge *src, RoutingEdge *dst,
-		                           double size, double rate);
-  bool shareResourcesIsIdempotent() {return true;}
-};
-
-/************
- * Resource *
- ************/
-
-class NetworkCm02Link : public Link {
-public:
-  NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
-	                           lmm_system_t system,
-	                           double constraint_value,
-	                           tmgr_history_t history,
-	                           e_surf_resource_state_t state_init,
-	                           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_event_t event_type, double value, double date);
-  void updateBandwidth(double value, double date=surf_get_clock());
-  void updateLatency(double value, double date=surf_get_clock());
-};
-
-
-/**********
- * Action *
- **********/
-
-class NetworkCm02Action : public NetworkAction {
-  friend Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);
-
-public:
-  NetworkCm02Action(Model *model, double cost, bool failed)
-     : NetworkAction(model, cost, failed) {};
-  void updateRemainingLazy(double now);
-};
+}
 
 #endif /* SURF_NETWORK_CM02_HPP_ */