X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ca0df6f5bb17b5708c11a19846c0e90e25b7889..d3c605045fe8c525f32393a054425d72edf47b18:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index d5ffeef752..bbac0ef94c 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -20,31 +20,28 @@ namespace surf { * Model * *********/ -void CpuModel::updateActionsStateLazy(double now, double /*delta*/) +void CpuModel::update_actions_state_lazy(double now, double /*delta*/) { while (not actionHeapIsEmpty() && double_equals(actionHeapTopDate(), now, sg_surf_precision)) { CpuAction* action = static_cast(actionHeapPop()); XBT_CDEBUG(surf_kernel, "Something happened to action %p", action); if (TRACE_is_enabled()) { - Cpu* cpu = static_cast(action->getVariable()->get_constraint(0)->get_id()); - TRACE_surf_host_set_utilization(cpu->getCname(), action->getCategory(), action->getVariable()->get_value(), - action->getLastUpdate(), now - action->getLastUpdate()); + Cpu* cpu = static_cast(action->get_variable()->get_constraint(0)->get_id()); + TRACE_surf_host_set_utilization(cpu->getCname(), action->get_category(), action->get_variable()->get_value(), + action->get_last_update(), now - action->get_last_update()); } action->finish(kernel::resource::Action::State::done); XBT_CDEBUG(surf_kernel, "Action %p finished", action); - - /* set the remains to 0 due to precision problems when updating the remaining amount */ - action->setRemains(0); } if (TRACE_is_enabled()) { //defining the last timestamp that we can safely dump to trace file //without losing the event ascending order (considering all CPU's) double smaller = -1; - for (kernel::resource::Action const& action : *getRunningActionSet()) { - if (smaller < 0 || action.getLastUpdate() < smaller) - smaller = action.getLastUpdate(); + for (kernel::resource::Action const& action : *get_running_action_set()) { + if (smaller < 0 || action.get_last_update() < smaller) + smaller = action.get_last_update(); } if (smaller > 0) { TRACE_last_timestamp_to_dump = smaller; @@ -52,25 +49,25 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) } } -void CpuModel::updateActionsStateFull(double now, double delta) +void CpuModel::update_actions_state_full(double now, double delta) { - for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) { + for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) { CpuAction& action = static_cast(*it); ++it; // increment iterator here since the following calls to action.finish() may invalidate it if (TRACE_is_enabled()) { - Cpu* cpu = static_cast(action.getVariable()->get_constraint(0)->get_id()); - TRACE_surf_host_set_utilization(cpu->getCname(), action.getCategory(), action.getVariable()->get_value(), + Cpu* cpu = static_cast(action.get_variable()->get_constraint(0)->get_id()); + TRACE_surf_host_set_utilization(cpu->getCname(), action.get_category(), action.get_variable()->get_value(), now - delta, delta); TRACE_last_timestamp_to_dump = now - delta; } - action.updateRemains(action.getVariable()->get_value() * delta); + action.update_remains(action.get_variable()->get_value() * delta); - if (action.getMaxDuration() != NO_MAX_DURATION) - action.updateMaxDuration(delta); + if (action.get_max_duration() != NO_MAX_DURATION) + action.update_max_duration(delta); - if (((action.getRemainsNoUpdate() <= 0) && (action.getVariable()->get_weight() > 0)) || - ((action.getMaxDuration() != NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) { + if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) || + ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { action.finish(kernel::resource::Action::State::done); } } @@ -173,28 +170,29 @@ void Cpu::setSpeedTrace(tmgr_trace_t trace) * Action * **********/ -void CpuAction::updateRemainingLazy(double now) +void CpuAction::update_remains_lazy(double now) { - xbt_assert(getStateSet() == getModel()->getRunningActionSet(), "You're updating an action that is not running."); - xbt_assert(getPriority() > 0, "You're updating an action that seems suspended."); + xbt_assert(get_state_set() == get_model()->get_running_action_set(), + "You're updating an action that is not running."); + xbt_assert(get_priority() > 0, "You're updating an action that seems suspended."); - double delta = now - getLastUpdate(); + double delta = now - get_last_update(); - if (getRemainsNoUpdate() > 0) { - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, getRemainsNoUpdate(), - getLastUpdate()); - updateRemains(getLastValue() * delta); + if (get_remains_no_update() > 0) { + XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(), + get_last_update()); + update_remains(get_last_value() * delta); if (TRACE_is_enabled()) { - Cpu* cpu = static_cast(getVariable()->get_constraint(0)->get_id()); - TRACE_surf_host_set_utilization(cpu->getCname(), getCategory(), getLastValue(), getLastUpdate(), - now - getLastUpdate()); + Cpu* cpu = static_cast(get_variable()->get_constraint(0)->get_id()); + TRACE_surf_host_set_utilization(cpu->getCname(), get_category(), get_last_value(), get_last_update(), + now - get_last_update()); } - XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, getRemainsNoUpdate()); + XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, get_remains_no_update()); } - refreshLastUpdate(); - setLastValue(getVariable()->get_value()); + set_last_update(); + set_last_value(get_variable()->get_value()); } simgrid::xbt::signal CpuAction::onStateChange; @@ -220,13 +218,13 @@ void CpuAction::set_state(Action::State state) /** @brief returns a list of all CPUs that this action is using */ std::list CpuAction::cpus() { std::list retlist; - int llen = getVariable()->get_number_of_constraint(); + int llen = get_variable()->get_number_of_constraint(); for (int i = 0; i < llen; i++) { /* Beware of composite actions: ptasks put links and cpus together */ // extra pb: we cannot dynamic_cast from void*... kernel::resource::Resource* resource = - static_cast(getVariable()->get_constraint(i)->get_id()); + static_cast(get_variable()->get_constraint(i)->get_id()); Cpu* cpu = dynamic_cast(resource); if (cpu != nullptr) retlist.push_back(cpu);