Fix network constant issues

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

diff --git a/src/surf/surf.cpp b/src/surf/surf.cpp
index 2d96617..b8f653e 100644 (file)
--- a/src/surf/surf.cpp
+++ b/src/surf/surf.cpp
@@ -667,10 +667,9 @@ Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props)
   : m_name(xbt_strdup(name)), m_properties(props), p_model(model), m_running(true)
 {}
 
-Resource::Resource(){
-  //FIXME:free(m_name);
-  //FIXME:xbt_dict_free(&m_properties);
-}
+Resource::Resource()
+: m_name(NULL), m_properties(NULL), p_model(NULL)
+{}
 
 const char *Resource::getName()
 {
@@ -731,6 +730,8 @@ ResourceLmm::ResourceLmm(surf_model_t model, const char *name, xbt_dict_t props,
   p_power.peak = metric_peak;
   if (metric_trace)
     p_power.event = tmgr_history_add_trace(history, metric_trace, 0.0, 0, static_cast<ResourcePtr>(this));
+  else
+    p_power.event = NULL;
 }
 
 /**********
@@ -756,7 +757,8 @@ Action::Action(ModelPtr model, double cost, bool failed):
          m_maxDuration(NO_MAX_DURATION),
          m_cost(cost),
          p_model(model),
-         m_refcount(1)
+         m_refcount(1),
+         p_data(NULL)
 {
   #ifdef HAVE_TRACING
     p_category = NULL;