X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45c3f1cfee86fb48c96d53f8267f99b6db6e3d7a..b35d70d6818026204833410d2e3917252fa35127:/src/surf/network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 46ac808b14..8f3e1b9427 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -1,64 +1,59 @@
-/* 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_
 
+#include <xbt/base.h>
+
+#include "network_interface.hpp"
+
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
-class NetworkConstantModel;
-typedef NetworkConstantModel *NetworkConstantModelPtr;
-
-class NetworkConstantLink;
-typedef NetworkConstantLink *NetworkConstantLinkPtr;
-
-class NetworkConstantAction;
-typedef NetworkConstantAction *NetworkConstantActionPtr;
+ 
+class XBT_PRIVATE NetworkConstantModel;
+class XBT_PRIVATE NetworkConstantAction;
 
 /*********
  * Model *
  *********/
-class NetworkConstantModel : public NetworkCm02Model {
+class NetworkConstantModel : public NetworkModel {
 public:
-  NetworkConstantModel()
-  : NetworkCm02Model("constant time network")
-  {
-    p_updateMechanism = UM_UNDEFINED;
-  };
+  NetworkConstantModel()  : NetworkModel() { };
+  ~NetworkConstantModel() { }
+
+  Action *communicate(NetCard *src, NetCard *dst, double size, double rate);
   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;
-};
+  bool shareResourcesIsIdempotent() {return true;}
 
-/************
- * 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();
+  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)                  { DIE_IMPOSSIBLE; }
+  void addTraces()                                         { DIE_IMPOSSIBLE; }
+  xbt_dynar_t getRoute(NetCard *src, NetCard *dst) { DIE_IMPOSSIBLE; }
 };
 
 /**********
  * Action *
  **********/
-class NetworkConstantAction : public NetworkCm02Action {
+class NetworkConstantAction : public NetworkAction {
 public:
-  NetworkConstantAction(NetworkConstantModelPtr model_, double size, double latency)
-  : NetworkCm02Action(model_, size, false)
+  NetworkConstantAction(NetworkConstantModel *model_, double size, double latency)
+  : NetworkAction(model_, size, false)
   , m_latInit(latency)
   {
 	m_latency = latency;
@@ -69,7 +64,6 @@ public:
 	p_variable = NULL;
   };
   int unref();
-  void recycle();
   void cancel();
   void setCategory(const char *category);
   void suspend();
@@ -79,4 +73,7 @@ public:
   int m_suspended;
 };
 
+}
+}
+
 #endif /* NETWORK_CONSTANT_HPP_ */