X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6e0974be6616f62aa724f7ec7ad1cff1b421e1e..2f2ce19fcb66a634c19de8dda2dc4b4896203537:/src/surf/surf.hpp diff --git a/src/surf/surf.hpp b/src/surf/surf.hpp index 683703be3a..770c293689 100644 --- a/src/surf/surf.hpp +++ b/src/surf/surf.hpp @@ -167,7 +167,10 @@ class Resource { public: Resource(); Resource(ModelPtr model, const char *name, xbt_dict_t properties); - virtual ~Resource() {}; + virtual ~Resource() { + xbt_free((void*)m_name); + xbt_dict_free(&m_properties); + }; virtual void updateState(tmgr_trace_event_t event_type, double value, double date)=0; @@ -202,7 +205,7 @@ private: class ResourceLmm: virtual public Resource { public: - ResourceLmm() {}; + ResourceLmm() { p_power.event = NULL; }; ResourceLmm(surf_model_t model, const char *name, xbt_dict_t props, lmm_system_t system, double constraint_value, @@ -211,6 +214,7 @@ public: tmgr_trace_t state_trace, double metric_peak, tmgr_trace_t metric_trace); + ~ResourceLmm() {}; lmm_constraint_t p_constraint; tmgr_trace_event_t p_stateEvent; s_surf_metric_t p_power; @@ -297,10 +301,14 @@ public: ActionLmm() : m_suspended(false) { p_actionListHookup.prev = 0; p_actionListHookup.next = 0; + m_lastUpdate = 0; + m_lastValue = 0; }; ActionLmm(ModelPtr /*model*/, double /*cost*/, bool /*failed*/) : m_suspended(false) { p_actionListHookup.prev = 0; p_actionListHookup.next = 0; + m_lastUpdate = 0; + m_lastValue = 0; }; virtual void updateRemainingLazy(double now);