X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e85177c669d793e84242983a1b1f430e47184e..3e2e56a1ff8c65d47e0cf4e458eac56e08a2b528:/src/surf/network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 46ac808b14..7a8644d0d2 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -1,82 +1,53 @@
-/* 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. */
 
-#include "network_cm02.hpp"
-
 #ifndef NETWORK_CONSTANT_HPP_
 #define NETWORK_CONSTANT_HPP_
 
-/***********
- * Classes *
- ***********/
-class NetworkConstantModel;
-typedef NetworkConstantModel *NetworkConstantModelPtr;
+#include <xbt/base.h>
+
+#include "network_interface.hpp"
+
+namespace simgrid {
+  namespace surf {
+
+    /***********
+     * Classes *
+     ***********/
+
+    class XBT_PRIVATE NetworkConstantModel;
+    class XBT_PRIVATE NetworkConstantAction;
 
-class NetworkConstantLink;
-typedef NetworkConstantLink *NetworkConstantLinkPtr;
+    /*********
+     * Model *
+     *********/
+    class NetworkConstantModel : public NetworkModel {
+    public:
+      NetworkConstantModel()  : NetworkModel() { };
+      ~NetworkConstantModel() override;
 
-class NetworkConstantAction;
-typedef NetworkConstantAction *NetworkConstantActionPtr;
+      Action *communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate) override;
+      double nextOccuringEvent(double now) override;
+      bool next_occuring_event_isIdempotent() override {return true;}
+      void updateActionsState(double now, double delta) override;
 
-/*********
- * Model *
- *********/
-class NetworkConstantModel : public NetworkCm02Model {
-public:
-  NetworkConstantModel()
-  : NetworkCm02Model("constant time network")
-  {
-    p_updateMechanism = UM_UNDEFINED;
-  };
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
-		                           double size, double rate);
-  void gapRemove(ActionPtr action);
-  //FIXME:virtual void addTraces() =0;
-};
+      Link* createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override;
+    };
 
-/************
- * Resource *
- ************/
-class NetworkConstantLink : public NetworkCm02Link {
-public:
-  NetworkConstantLink(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 NetworkConstantAction : public NetworkAction {
+    public:
+      NetworkConstantAction(NetworkConstantModel *model_, double size, double latency);
+      ~NetworkConstantAction();
+      double initialLatency_;
+    };
 
-/**********
- * Action *
- **********/
-class NetworkConstantAction : public NetworkCm02Action {
-public:
-  NetworkConstantAction(NetworkConstantModelPtr 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 recycle();
-  void cancel();
-  void setCategory(const char *category);
-  void suspend();
-  void resume();
-  bool isSuspended();
-  double m_latInit;
-  int m_suspended;
-};
+  }
+}
 
 #endif /* NETWORK_CONSTANT_HPP_ */