Clean surf interface

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

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index e36d472..6bc4328 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -10,6 +10,8 @@
 #ifndef NETWORK_INTERFACE_CPP_
 #define NETWORK_INTERFACE_CPP_
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
+                                "Logging specific to the SURF network module");
 
 NetworkModelPtr surf_network_model = NULL;
 
@@ -32,9 +34,18 @@ double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /
   return rate;
 }
 
+NetworkLinkLmm::NetworkLinkLmm(lmm_constraint_t constraint,
+                                  tmgr_history_t history,
+                                  tmgr_trace_t state_trace)
+: ResourceLmm(constraint)
+{
+  if (state_trace)
+    p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast<ResourcePtr>(this));
+}
+
 bool NetworkLinkLmm::isUsed()
 {
-  return lmm_constraint_used(p_model->p_maxminSystem, p_constraint);
+  return lmm_constraint_used(getModel()->getMaxminSystem(), constraint());
 }
 
 double NetworkLink::getLatency()
@@ -49,7 +60,7 @@ double NetworkLinkLmm::getBandwidth()
 
 bool NetworkLinkLmm::isShared()
 {
-  return lmm_constraint_is_shared(p_constraint);
+  return lmm_constraint_is_shared(constraint());
 }
 
 #endif /* NETWORK_INTERFACE_CPP_ */