X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/956eaac43ffca0a0f2d2dcffdd41704beefdf6d8..fb588fbb8c119a8f04e6d2cb15b663257786ba70:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index c746e9a836..5464386e09 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -17,18 +17,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, * CallBacks * *************/ -static void parse_cpu_init(sg_platf_host_cbarg_t host){ - ((CpuCas01ModelPtr)surf_cpu_model_pm)->parseInit(host); -} - -static void cpu_add_traces_cpu(){ - surf_cpu_model_pm->addTraces(); -} - static void cpu_define_callbacks() { - sg_platf_host_add_cb(parse_cpu_init); - sg_platf_postparse_add_cb(cpu_add_traces_cpu); + sg_platf_host_add_cb(cpu_parse_init); + sg_platf_postparse_add_cb(cpu_add_traces); } /********* @@ -50,8 +42,8 @@ void surf_cpu_model_init_Cas01() surf_cpu_model_vm = new CpuCas01Model(); cpu_define_callbacks(); - ModelPtr model_pm = static_cast(surf_cpu_model_pm); - ModelPtr model_vm = static_cast(surf_cpu_model_vm); + ModelPtr model_pm = surf_cpu_model_pm; + ModelPtr model_vm = surf_cpu_model_vm; xbt_dynar_push(model_list, &model_pm); xbt_dynar_push(model_list, &model_vm); } @@ -93,8 +85,7 @@ CpuCas01Model::CpuCas01Model() : CpuModel("cpu") } if (getUpdateMechanism() == UM_LAZY) { - p_actionHeap = xbt_heap_new(8, NULL); - xbt_heap_set_update_callback(p_actionHeap, surf_action_lmm_update_index_heap); + p_actionHeap = new ActionHeap(); p_modifiedSet = new ActionLmmList(); p_maxminSystem->keep_track = p_modifiedSet; } @@ -106,7 +97,7 @@ CpuCas01Model::~CpuCas01Model() p_maxminSystem = NULL; if (p_actionHeap) - xbt_heap_free(p_actionHeap); + delete p_actionHeap; delete p_modifiedSet; surf_cpu_model_pm = NULL; @@ -114,20 +105,7 @@ CpuCas01Model::~CpuCas01Model() delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked; } -void CpuCas01Model::parseInit(sg_platf_host_cbarg_t host) -{ - createResource(host->id, - host->power_peak, - host->pstate, - host->power_scale, - host->power_trace, - host->core_amount, - host->initial_state, - host->state_trace, - host->properties); -} - -CpuPtr CpuCas01Model::createResource(const char *name, xbt_dynar_t power_peak, +CpuPtr CpuCas01Model::createCpu(const char *name, xbt_dynar_t power_peak, int pstate, double power_scale, tmgr_trace_t power_trace, int core, e_surf_resource_state_t state_initial, @@ -143,7 +121,7 @@ CpuPtr CpuCas01Model::createResource(const char *name, xbt_dynar_t power_peak, xbt_assert(core > 0, "Invalid number of cores %d", core); cpu = new CpuCas01(this, name, power_peak, pstate, power_scale, power_trace, core, state_initial, state_trace, cpu_properties); - xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, static_cast(cpu)); + xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); return cpu; } @@ -171,7 +149,7 @@ void CpuCas01Model::addTraces() xbt_assert(host, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - host->setStateEvent(tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(host))); + host->setStateEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host)); } xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { @@ -181,7 +159,7 @@ void CpuCas01Model::addTraces() xbt_assert(host, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - host->setPowerEvent(tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(host))); + host->setPowerEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host)); } } @@ -204,10 +182,10 @@ CpuCas01::CpuCas01(CpuCas01ModelPtr model, const char *name, xbt_dynar_t powerPe m_core = core; setState(stateInitial); if (powerTrace) - p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, static_cast(this)); + p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, this); if (stateTrace) - p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, static_cast(this)); + p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this); } CpuCas01::~CpuCas01(){ @@ -259,7 +237,7 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d #endif while ((var = lmm_get_var_from_cnst (getModel()->getMaxminSystem(), getConstraint(), &elem))) { - CpuCas01ActionPtr action = static_cast(static_cast(lmm_variable_id(var))); + CpuCas01ActionPtr action = static_cast(lmm_variable_id(var)); lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), @@ -315,7 +293,7 @@ CpuActionPtr CpuCas01::execute(double size) CpuActionPtr CpuCas01::sleep(double duration) { if (duration > 0) - duration = MAX(duration, MAXMIN_PRECISION); + duration = MAX(duration, sg_surf_precision); XBT_IN("(%s,%g)", getName(), duration); CpuCas01ActionPtr action = new CpuCas01Action(getModel(), 1.0, getState() != SURF_RESOURCE_ON, @@ -336,7 +314,7 @@ CpuActionPtr CpuCas01::sleep(double duration) lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), 0.0); if (getModel()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap - action->heapRemove(getModel()->getActionHeap()); + action->heapRemove(); // this is necessary for a variable with weight 0 since such // variables are ignored in lmm and we need to set its max_duration // correctly at the next call to share_resources @@ -381,12 +359,11 @@ void CpuCas01::setPowerPeakAt(int pstate_index) CpuCas01Action::CpuCas01Action(ModelPtr model, double cost, bool failed, double power, lmm_constraint_t constraint) : CpuAction(model, cost, failed, - lmm_variable_new(model->getMaxminSystem(), static_cast(this), + lmm_variable_new(model->getMaxminSystem(), this, 1.0, power, 1)) { m_suspended = 0; if (model->getUpdateMechanism() == UM_LAZY) { - m_indexHeap = -1; m_lastUpdate = surf_get_clock(); m_lastValue = 0.0; }