X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4ed74ca6d4a744d2956a4f2906c897e1886cefd..9509e207c1b25e1e20bbb25bfdfc43f69c647ad4:/src/surf/network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 2b0f0e06bc..d8e37a7454 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -1,73 +1,51 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* 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. */
 
-#include "network_cm02.hpp"
-
 #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;
-class NetworkConstantAction;
+
+class XBT_PRIVATE NetworkConstantModel;
+class XBT_PRIVATE NetworkConstantAction;
 
 /*********
  * Model *
  *********/
-class NetworkConstantModel : public NetworkCm02Model {
+class NetworkConstantModel : public NetworkModel {
 public:
-  NetworkConstantModel()
-  : NetworkCm02Model()
-  {
-    p_updateMechanism = UM_UNDEFINED;
-  };
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  Action *communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);
-  void gapRemove(Action *action);
-};
+  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;
 
-/************
- * Resource *
- ************/
-class NetworkConstantLink : public NetworkCm02Link {
-public:
-  NetworkConstantLink(NetworkCm02Model *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* createLink(const std::string& name, double bw, double lat, s4u::Link::SharingPolicy policy) override;
 };
 
 /**********
  * Action *
  **********/
-class NetworkConstantAction : public NetworkCm02Action {
+class NetworkConstantAction : public NetworkAction {
 public:
-  NetworkConstantAction(NetworkConstantModel *model_, double size, double latency)
-  : NetworkCm02Action(model_, size, false)
-  , m_latInit(latency)
-  {
-	m_latency = latency;
-	if (m_latency <= 0.0) {
-	  p_stateSet = getModel()->getDoneActionSet();
-	  p_stateSet->push_back(*this);
-	}
-	p_variable = NULL;
-  };
-  int unref();
-  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 initialLatency_;
+  void update_remains_lazy(double now) override;
 };
+}
+} // namespace kernel
+} // namespace simgrid
 
 #endif /* NETWORK_CONSTANT_HPP_ */