X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a243b4c3535f516d05259cac06963c422d4aadc0..0fa053f89a0b5f34a050f4790925d9d63ac11073:/src/surf/network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index c9c140d8f7..c2219d97fd 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -1,70 +1,52 @@
-#include "network.hpp"
+/* Copyright (c) 2013-2018. 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 NETWORK_CONSTANT_HPP_
 #define NETWORK_CONSTANT_HPP_
 
+#include <xbt/base.h>
+
+#include "network_interface.hpp"
+
+namespace simgrid {
+namespace kernel {
+namespace resource {
+
 /***********
  * Classes *
  ***********/
-class NetworkConstantModel;
-typedef NetworkConstantModel *NetworkConstantModelPtr;
-
-class NetworkConstantLinkLmm;
-typedef NetworkConstantLinkLmm *NetworkConstantLinkLmmPtr;
 
-class NetworkConstantActionLmm;
-typedef NetworkConstantActionLmm *NetworkConstantActionLmmPtr;
+class XBT_PRIVATE NetworkConstantModel;
+class XBT_PRIVATE NetworkConstantAction;
 
 /*********
  * Model *
  *********/
-class NetworkConstantModel : public NetworkCm02Model {
-public:
-  NetworkConstantModel() : NetworkCm02Model("constant time network") {};
-  NetworkCm02LinkLmmPtr createResource(string name);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
-		                           double size, double rate);
-  void gapRemove(ActionLmmPtr action);
-  //FIXME:virtual void addTraces() =0;
-};
-
-/************
- * Resource *
- ************/
-class NetworkConstantLinkLmm : public NetworkCm02LinkLmm {
-public:
-  NetworkConstantLinkLmm(NetworkCm02ModelPtr model, const char* name, xbt_dict_t properties);
-  bool isUsed();
-  void updateState(tmgr_trace_event_t event_type, double value, double date);
-  double getBandwidth();
-  double getLatency();
-  bool isShared();
-};
-
-/**********
- * Action *
- **********/
-class NetworkConstantActionLmm : public NetworkCm02ActionLmm {
+class NetworkConstantModel : public NetworkModel {
 public:
-  NetworkConstantActionLmm(NetworkConstantModelPtr model, double latency):
-	  Action(model, 0, false), NetworkCm02ActionLmm(model, 0, false), m_latInit(latency) {
-	m_latency = latency;
-	if (m_latency <= 0.0) {
-	  p_stateSet = p_model->p_doneActionSet;
-	  xbt_swag_insert(static_cast<ActionPtr>(this), p_stateSet);
-	}
-  };
-  int unref();
-  void recycle();
-  void cancel();
-  void setCategory(const char *category);
-  void suspend();
-  void resume();
-  bool isSuspended();
-  double m_latInit;
-  int m_suspended;
-};
+  NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::Full) {}
+  Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size, double rate) override;
+  double next_occuring_event(double now) override;
+  void update_actions_state(double now, double delta) override;
+
+  LinkImpl* createLink(const std::string& name, double bw, double lat, e_surf_link_sharing_policy_t policy) override;
+    };
+
+    /**********
+     * Action *
+     **********/
+    class NetworkConstantAction : public NetworkAction {
+    public:
+      NetworkConstantAction(NetworkConstantModel *model_, double size, double latency);
+      ~NetworkConstantAction();
+      double initialLatency_;
+      void update_remains_lazy(double now) override;
+    };
+
+  }
+}
+} // namespace simgrid
 
 #endif /* NETWORK_CONSTANT_HPP_ */