Rename RoutingEdge into NetCard

[simgrid.git] / src / surf / network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 9847795..8f3e1b9 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -1,62 +1,69 @@
-#include "network_cm02.hpp"
+/* 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. */
 
 #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 NetworkConstantLinkLmm;
-typedef NetworkConstantLinkLmm *NetworkConstantLinkLmmPtr;
-
-class NetworkConstantActionLmm;
-typedef NetworkConstantActionLmm *NetworkConstantActionLmmPtr;
+ 
+class XBT_PRIVATE NetworkConstantModel;
+class XBT_PRIVATE NetworkConstantAction;
 
 /*********
  * Model *
  *********/
-class NetworkConstantModel : public NetworkCm02Model {
+class NetworkConstantModel : public NetworkModel {
 public:
-  NetworkConstantModel() : NetworkCm02Model("constant time network") {};
+  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(ActionLmmPtr action);
-  //FIXME:virtual void addTraces() =0;
-};
+  bool shareResourcesIsIdempotent() {return true;}
 
-/************
- * 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();
+  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 NetworkConstantActionLmm : public NetworkCm02ActionLmm {
+class NetworkConstantAction : public NetworkAction {
 public:
-  NetworkConstantActionLmm(NetworkConstantModelPtr model_, double size, double latency):
-         Action(model_, size, false), NetworkCm02ActionLmm(model_, 0, false), m_latInit(latency) {
+  NetworkConstantAction(NetworkConstantModel *model_, double size, double latency)
+  : NetworkAction(model_, size, false)
+  , m_latInit(latency)
+  {
        m_latency = latency;
        if (m_latency <= 0.0) {
          p_stateSet = getModel()->getDoneActionSet();
-         xbt_swag_insert(static_cast<ActionPtr>(this), p_stateSet);
+         p_stateSet->push_back(*this);
        }
+       p_variable = NULL;
   };
   int unref();
-  void recycle();
   void cancel();
   void setCategory(const char *category);
   void suspend();
@@ -66,4 +73,7 @@ public:
   int m_suspended;
 };
 
+}
+}
+
 #endif /* NETWORK_CONSTANT_HPP_ */