*********/
Model::Model(string name)
- : m_name(name), m_resOnCB(0), m_resOffCB(0),
- m_actSuspendCB(0), m_actCancelCB(0), m_actResumeCB(0),
- p_maxminSystem(0)
+ : p_maxminSystem(0), m_name(name),
+ m_resOnCB(0), m_resOffCB(0),
+ m_actCancelCB(0), m_actSuspendCB(0), m_actResumeCB(0)
{
ActionPtr action = NULL;
p_readyActionSet = xbt_swag_new(xbt_swag_offset(*action, p_stateHookup));
************/
Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props)
- : m_name(xbt_strdup(name)), m_running(true), p_model(model), m_properties(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()
{
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;
}
/**********
Action::Action(){}
Action::Action(ModelPtr model, double cost, bool failed):
- m_cost(cost), p_model(model), m_failed(failed), m_remains(cost),
- m_refcount(1), m_priority(1.0), m_maxDuration(NO_MAX_DURATION),
- m_start(surf_get_clock()), m_finish(-1.0)
+ m_priority(1.0),
+ m_failed(failed),
+ m_start(surf_get_clock()), m_finish(-1.0),
+ m_remains(cost),
+ m_maxDuration(NO_MAX_DURATION),
+ m_cost(cost),
+ p_model(model),
+ m_refcount(1),
+ p_data(NULL)
{
#ifdef HAVE_TRACING
p_category = NULL;