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

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index ef9344b95f..eed41ed0a0 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -1,70 +1,39 @@
-#include "network.hpp"
+/* 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. */
 
 #ifndef NETWORK_CONSTANT_HPP_
 #define NETWORK_CONSTANT_HPP_
 
-/***********
- * Classes *
- ***********/
-class NetworkConstantModel;
-typedef NetworkConstantModel *NetworkConstantModelPtr;
+#include <xbt/base.h>
 
-class NetworkConstantLinkLmm;
-typedef NetworkConstantLinkLmm *NetworkConstantLinkLmmPtr;
+#include "network_interface.hpp"
 
-class NetworkConstantActionLmm;
-typedef NetworkConstantActionLmm *NetworkConstantActionLmmPtr;
+namespace simgrid {
+namespace kernel {
+namespace resource {
 
-/*********
- * Model *
- *********/
-class NetworkConstantModel : public NetworkCm02Model {
+class NetworkConstantModel : public NetworkModel {
 public:
-  NetworkConstantModel() : NetworkCm02Model("constant time network") {};
-  NetworkCm02LinkLmmPtr createResource(string name);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  NetworkCm02ActionLmmPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
-		                           double size, double rate);
-  void gapRemove(ActionLmmPtr action);
-  //FIXME:virtual void addTraces() =0;
-};
+  NetworkConstantModel();
+  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;
 
-/************
- * 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();
+  LinkImpl* create_link(const std::string& name, double bw, double lat, s4u::Link::SharingPolicy policy) override;
 };
 
-/**********
- * Action *
- **********/
-class NetworkConstantActionLmm : public NetworkCm02ActionLmm {
+class NetworkConstantAction : public NetworkAction {
 public:
-  NetworkConstantActionLmm(NetworkConstantModelPtr model, double latency):
-	  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;
+  NetworkConstantAction(NetworkConstantModel* model_, double size, double latency);
+  ~NetworkConstantAction();
+  double initial_latency_;
+  void update_remains_lazy(double now) override;
 };
 
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
+
 #endif /* NETWORK_CONSTANT_HPP_ */