Energy is now a plugin

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

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 81ebd148607462118ffb548ec4683ba43a1767ce..fd646bb78f3cfb23cac06abd113a10bb24142f87 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -19,15 +19,9 @@ typedef NetworkModel *NetworkModelPtr;
 class NetworkLink;
 typedef NetworkLink *NetworkLinkPtr;
 
-class NetworkLinkLmm;
-typedef NetworkLinkLmm *NetworkLinkLmmPtr;
-
 class NetworkAction;
 typedef NetworkAction *NetworkActionPtr;
 
-class NetworkActionLmm;
-typedef NetworkActionLmm *NetworkActionLmmPtr;
-
 /*********
  * Tools *
  *********/
@@ -41,7 +35,7 @@ class NetworkModel : public Model {
 public:
   NetworkModel() : Model("network") {
   };
-  NetworkModel(string name) : Model(name) {
+  NetworkModel(const char *name) : Model(name) {
        f_networkSolve = lmm_solve;
        m_haveGap = false;
   };
@@ -51,7 +45,7 @@ public:
        if (p_actionHeap)
          xbt_heap_free(p_actionHeap);
        if (p_modifiedSet)
-         xbt_swag_free(p_modifiedSet);
+         delete p_modifiedSet;
   }
 
   virtual NetworkLinkPtr createResource(const char *name,
@@ -64,8 +58,7 @@ public:
                                    e_surf_link_sharing_policy_t policy,
                                    xbt_dict_t properties)=0;
 
-  //FIXME:void updateActionsStateLazy(double now, double delta);
-  virtual void gapAppend(double /*size*/, const NetworkLinkLmmPtr /*link*/, NetworkActionLmmPtr /*action*/) {};
+  virtual void gapAppend(double /*size*/, const NetworkLinkPtr /*link*/, NetworkActionPtr /*action*/) {};
   virtual ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
                                           double size, double rate)=0;
   virtual xbt_dynar_t getRoute(RoutingEdgePtr src, RoutingEdgePtr dst); //FIXME: kill field? That is done by the routing nowadays
@@ -80,43 +73,37 @@ public:
  * Resource *
  ************/
 
-class NetworkLink : virtual public Resource {
+class NetworkLink : public Resource {
 public:
-  NetworkLink() : p_latEvent(NULL) {};
-  virtual double getBandwidth()=0;
+  NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props);
+  NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props,
+                     lmm_constraint_t constraint,
+                 tmgr_history_t history,
+                 tmgr_trace_t state_trace);
+  virtual double getBandwidth();
   virtual double getLatency();
-  virtual bool isShared()=0;
+  virtual bool isShared();
+  bool isUsed();
 
   /* Using this object with the public part of
     model does not make sense */
   double m_latCurrent;
   tmgr_trace_event_t p_latEvent;
-};
 
-class NetworkLinkLmm : public ResourceLmm, public NetworkLink {
-public:
-  NetworkLinkLmm() {};
-  NetworkLinkLmm(lmm_system_t system,
-                    double constraint_value,
-                    tmgr_history_t history,
-                    e_surf_resource_state_t state_init,
-                    tmgr_trace_t state_trace,
-                    double metric_peak,
-                    tmgr_trace_t metric_trace)
- : ResourceLmm(system, constraint_value, history, state_init, state_trace, metric_peak, metric_trace)
-{
-}
-  bool isShared();
-  bool isUsed();
-  double getBandwidth();
+  /* LMM */
+  tmgr_trace_event_t p_stateEvent;
+  s_surf_metric_t p_power;
 };
 
 /**********
  * Action *
  **********/
-class NetworkAction : virtual public Action {
+class NetworkAction : public Action {
 public:
-  NetworkAction() {};
+  NetworkAction(ModelPtr model, double cost, bool failed)
+  : Action(model, cost, failed) {}
+  NetworkAction(ModelPtr model, double cost, bool failed, lmm_variable_t var)
+  : Action(model, cost, failed, var) {};
   double m_latency;
   double m_latCurrent;
   double m_weight;
@@ -131,11 +118,6 @@ public:
 
 };
 
-class NetworkActionLmm : public ActionLmm, public NetworkAction {
-public:
-  NetworkActionLmm() {};
-};
-
 #endif /* SURF_NETWORK_INTERFACE_HPP_ */