make cluster routing a bit more flexible, to allow adding other kinds of clusters

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

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index a7767aaf604525f4c419d5ba497f191216b768fa..49103cebbb184a6cdf155fb104e65cca4be4fded 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -34,9 +34,24 @@ double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /
   return rate;
 }
 
-bool NetworkLinkLmm::isUsed()
+NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props)
+: p_latEvent(NULL)
+{}
+
+NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props,
+                                lmm_constraint_t constraint,
+                            tmgr_history_t history,
+                            tmgr_trace_t state_trace)
+: Resource(model, name, props, constraint),
+  p_latEvent(NULL)
+{
+  if (state_trace)
+    p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast<ResourcePtr>(this));
+}
+
+bool NetworkLink::isUsed()
 {
-  return lmm_constraint_used(p_model->p_maxminSystem, p_constraint);
+  return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
 }
 
 double NetworkLink::getLatency()
@@ -44,14 +59,14 @@ double NetworkLink::getLatency()
   return m_latCurrent;
 }
 
-double NetworkLinkLmm::getBandwidth()
+double NetworkLink::getBandwidth()
 {
   return p_power.peak * p_power.scale;
 }
 
-bool NetworkLinkLmm::isShared()
+bool NetworkLink::isShared()
 {
-  return lmm_constraint_is_shared(p_constraint);
+  return lmm_constraint_is_shared(getConstraint());
 }
 
 #endif /* NETWORK_INTERFACE_CPP_ */