From 387f0d33929229d58e854595762a9951d880b9fb Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 31 Mar 2018 17:52:26 +0200 Subject: [PATCH 1/1] cosmetics in cpu_ti --- include/simgrid/kernel/resource/Resource.hpp | 2 +- src/s4u/s4u_link.cpp | 2 +- src/simgrid/host.cpp | 2 +- src/surf/StorageImpl.cpp | 2 +- src/surf/StorageImpl.hpp | 2 +- src/surf/cpu_cas01.cpp | 2 +- src/surf/cpu_cas01.hpp | 2 +- src/surf/cpu_interface.cpp | 4 +- src/surf/cpu_interface.hpp | 6 +- src/surf/cpu_ti.cpp | 216 +++++++++---------- src/surf/cpu_ti.hpp | 52 ++--- src/surf/network_interface.cpp | 2 +- src/surf/network_interface.hpp | 2 +- src/surf/ptask_L07.cpp | 7 +- src/surf/ptask_L07.hpp | 4 +- src/surf/sg_platf.cpp | 4 +- src/surf/surf_c_bindings.cpp | 2 +- src/surf/trace_mgr_test.cpp | 4 +- src/surf/xml/surfxml_parseplatf.cpp | 2 +- 19 files changed, 149 insertions(+), 170 deletions(-) diff --git a/include/simgrid/kernel/resource/Resource.hpp b/include/simgrid/kernel/resource/Resource.hpp index 551ff4c754..7c8c075da2 100644 --- a/include/simgrid/kernel/resource/Resource.hpp +++ b/include/simgrid/kernel/resource/Resource.hpp @@ -53,7 +53,7 @@ public: virtual void apply_event(TraceEvent* event, double value) = 0; /** @brief Check if the current Resource is used (if it currently serves an action) */ - virtual bool isUsed() = 0; + virtual bool is_used() = 0; /** @brief returns the current load (in flops per second, byte per second or similar) */ virtual double getLoad(); diff --git a/src/s4u/s4u_link.cpp b/src/s4u/s4u_link.cpp index 02e0102f68..b36652171c 100644 --- a/src/s4u/s4u_link.cpp +++ b/src/s4u/s4u_link.cpp @@ -94,7 +94,7 @@ const char* Link::name() } bool Link::isUsed() { - return this->pimpl_->isUsed(); + return this->pimpl_->is_used(); } double Link::latency() diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 346a1c45b7..32f2e5d1cf 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -151,7 +151,7 @@ int sg_host_core_count(sg_host_t host) double sg_host_get_available_speed(sg_host_t host) { - return host->pimpl_cpu->getAvailableSpeed(); + return host->pimpl_cpu->get_available_speed(); } /** @brief Returns the number of power states for a host. diff --git a/src/surf/StorageImpl.cpp b/src/surf/StorageImpl.cpp index d15f28513f..4d4d01afe9 100644 --- a/src/surf/StorageImpl.cpp +++ b/src/surf/StorageImpl.cpp @@ -65,7 +65,7 @@ StorageImpl::~StorageImpl() storageDestructedCallbacks(this); } -bool StorageImpl::isUsed() +bool StorageImpl::is_used() { THROW_UNIMPLEMENTED; return false; diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index e16fb4d465..f0c29a699b 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -94,7 +94,7 @@ public: s4u::Storage piface_; /** @brief Check if the Storage is used (if an action currently uses its resources) */ - bool isUsed() override; + bool is_used() override; void apply_event(tmgr_trace_event_t event, double value) override; diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 01a1e85b25..4f105a58ee 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -104,7 +104,7 @@ std::vector * CpuCas01::getSpeedPeakList(){ return &speedPerPstate_; } -bool CpuCas01::isUsed() +bool CpuCas01::is_used() { return model()->get_maxmin_system()->constraint_used(constraint()); } diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp index ba1f13d7bc..3671bd8cdb 100644 --- a/src/surf/cpu_cas01.hpp +++ b/src/surf/cpu_cas01.hpp @@ -44,7 +44,7 @@ public: CpuAction* execution_start(double size, int requestedCore) override; CpuAction* sleep(double duration) override; - bool isUsed() override; + bool is_used() override; std::vector * getSpeedPeakList(); // FIXME: killme to hide our internals diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index bbac0ef94c..97473382c5 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -136,7 +136,7 @@ double Cpu::getSpeed(double load) return load * speed_.peak; } -double Cpu::getAvailableSpeed() +double Cpu::get_available_speed() { /* number between 0 and 1 */ return speed_.scale; @@ -158,7 +158,7 @@ void Cpu::setStateTrace(tmgr_trace_t trace) stateEvent_ = future_evt_set->add_trace(trace, this); } -void Cpu::setSpeedTrace(tmgr_trace_t trace) +void Cpu::set_speed_trace(tmgr_trace_t trace) { xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->getCname()); diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 72a99af01e..00d095cb6b 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -114,7 +114,7 @@ protected: public: /** @brief Get the available speed of the current Cpu */ - virtual double getAvailableSpeed(); + virtual double get_available_speed(); /** @brief Get the current Cpu computational speed */ virtual double getPstateSpeed(int pstate_index); @@ -132,7 +132,9 @@ public: int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/ virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values (0 or 1). */ - virtual void setSpeedTrace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load). Trace must contain relative values (ratio between 0 and 1) */ + virtual void + set_speed_trace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to + external load). Trace must contain relative values (ratio between 0 and 1) */ tmgr_trace_event_t stateEvent_ = nullptr; Metric speed_ = {1.0, 0, nullptr}; diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index c04b25af94..06a7f58777 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -25,23 +25,23 @@ CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace) double integral = 0; double time = 0; int i = 0; - nbPoints_ = speedTrace->event_list.size() + 1; - timePoints_ = new double[nbPoints_]; - integral_ = new double[nbPoints_]; + nb_points_ = speedTrace->event_list.size() + 1; + time_points_ = new double[nb_points_]; + integral_ = new double[nb_points_]; for (auto const& val : speedTrace->event_list) { - timePoints_[i] = time; + time_points_[i] = time; integral_[i] = integral; integral += val.date_ * val.value_; time += val.date_; i++; } - timePoints_[i] = time; + time_points_[i] = time; integral_[i] = integral; } CpuTiTrace::~CpuTiTrace() { - delete [] timePoints_; + delete[] time_points_; delete [] integral_; } @@ -76,20 +76,20 @@ double CpuTiTgmr::integrate(double a, double b) return ((b - a) * value_); } - if (fabs(ceil(a / lastTime_) - a / lastTime_) < EPSILON) - a_index = 1 + static_cast(ceil(a / lastTime_)); + if (fabs(ceil(a / last_time_) - a / last_time_) < EPSILON) + a_index = 1 + static_cast(ceil(a / last_time_)); else - a_index = static_cast (ceil(a / lastTime_)); + a_index = static_cast(ceil(a / last_time_)); - int b_index = static_cast (floor(b / lastTime_)); + int b_index = static_cast(floor(b / last_time_)); if (a_index > b_index) { /* Same chunk */ - return trace_->integrateSimple(a - (a_index - 1) * lastTime_, b - (b_index) * lastTime_); + return trace_->integrate_simple(a - (a_index - 1) * last_time_, b - (b_index)*last_time_); } - double first_chunk = trace_->integrateSimple(a - (a_index - 1) * lastTime_, lastTime_); + double first_chunk = trace_->integrate_simple(a - (a_index - 1) * last_time_, last_time_); double middle_chunk = (b_index - a_index) * total_; - double last_chunk = trace_->integrateSimple(0.0, b - (b_index) * lastTime_); + double last_chunk = trace_->integrate_simple(0.0, b - (b_index)*last_time_); XBT_DEBUG("first_chunk=%.2f middle_chunk=%.2f last_chunk=%.2f\n", first_chunk, middle_chunk, last_chunk); @@ -102,28 +102,28 @@ double CpuTiTgmr::integrate(double a, double b) * \param a Initial point * \param b Final point */ -double CpuTiTrace::integrateSimple(double a, double b) +double CpuTiTrace::integrate_simple(double a, double b) { - return integrateSimplePoint(b) - integrateSimplePoint(a); + return integrate_simple_point(b) - integrate_simple_point(a); } /** * \brief Auxiliary function to compute the integral at point a. * \param a point */ -double CpuTiTrace::integrateSimplePoint(double a) +double CpuTiTrace::integrate_simple_point(double a) { double integral = 0; double a_aux = a; - int ind = binarySearch(timePoints_, a, 0, nbPoints_ - 1); + int ind = binary_search(time_points_, a, 0, nb_points_ - 1); integral += integral_[ind]; - XBT_DEBUG("a %f ind %d integral %f ind + 1 %f ind %f time +1 %f time %f", - a, ind, integral, integral_[ind + 1], integral_[ind], timePoints_[ind + 1], timePoints_[ind]); - double_update(&a_aux, timePoints_[ind], sg_maxmin_precision*sg_surf_precision); + XBT_DEBUG("a %f ind %d integral %f ind + 1 %f ind %f time +1 %f time %f", a, ind, integral, integral_[ind + 1], + integral_[ind], time_points_[ind + 1], time_points_[ind]); + double_update(&a_aux, time_points_[ind], sg_maxmin_precision * sg_surf_precision); if (a_aux > 0) - integral += ((integral_[ind + 1] - integral_[ind]) / (timePoints_[ind + 1] - timePoints_[ind])) * - (a - timePoints_[ind]); + integral += + ((integral_[ind + 1] - integral_[ind]) / (time_points_[ind + 1] - time_points_[ind])) * (a - time_points_[ind]); XBT_DEBUG("Integral a %f = %f", a, integral); return integral; @@ -168,38 +168,23 @@ double CpuTiTgmr::solve(double a, double amount) /* Reduce the problem to one where amount <= trace_total */ int quotient = static_cast(floor(amount / total_)); double reduced_amount = (total_) * ((amount / total_) - floor(amount / total_)); - double reduced_a = a - (lastTime_) * static_cast(floor(a / lastTime_)); + double reduced_a = a - (last_time_) * static_cast(floor(a / last_time_)); XBT_DEBUG("Quotient: %d reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a); /* Now solve for new_amount which is <= trace_total */ - double reduced_b = solveSomewhatSimple(reduced_a, reduced_amount); + double reduced_b; + XBT_DEBUG("Solve integral: [%.2f, amount=%.2f]", reduced_a, reduced_amount); + double amount_till_end = integrate(reduced_a, last_time_); -/* Re-map to the original b and amount */ - double b = (lastTime_) * static_cast(floor(a / lastTime_)) + (quotient * lastTime_) + reduced_b; - return b; -} - -/** -* \brief Auxiliary function to solve integral -* -* Here, amount is <= trace->total -* and a <=trace->last_time -* -*/ -double CpuTiTgmr::solveSomewhatSimple(double a, double amount) -{ - double b; - - XBT_DEBUG("Solve integral: [%.2f, amount=%.2f]", a, amount); - double amount_till_end = integrate(a, lastTime_); - - if (amount_till_end > amount) { - b = trace_->solveSimple(a, amount); + if (amount_till_end > reduced_amount) { + reduced_b = trace_->solve_simple(reduced_a, reduced_amount); } else { - b = lastTime_ + trace_->solveSimple(0.0, amount - amount_till_end); + reduced_b = last_time_ + trace_->solve_simple(0.0, reduced_amount - amount_till_end); } - return b; + + /* Re-map to the original b and amount */ + return (last_time_) * static_cast(floor(a / last_time_)) + (quotient * last_time_) + reduced_b; } /** @@ -209,13 +194,13 @@ double CpuTiTgmr::solveSomewhatSimple(double a, double amount) * \param amount Amount of flops * \return The date when amount is available. */ -double CpuTiTrace::solveSimple(double a, double amount) +double CpuTiTrace::solve_simple(double a, double amount) { - double integral_a = integrateSimplePoint(a); - int ind = binarySearch(integral_, integral_a + amount, 0, nbPoints_ - 1); - double time = timePoints_[ind]; + double integral_a = integrate_simple_point(a); + int ind = binary_search(integral_, integral_a + amount, 0, nb_points_ - 1); + double time = time_points_[ind]; time += (integral_a + amount - integral_[ind]) / - ((integral_[ind + 1] - integral_[ind]) / (timePoints_[ind + 1] - timePoints_[ind])); + ((integral_[ind + 1] - integral_[ind]) / (time_points_[ind + 1] - time_points_[ind])); return time; } @@ -227,11 +212,11 @@ double CpuTiTrace::solveSimple(double a, double amount) * \param a Time * \return CPU speed scale */ -double CpuTiTgmr::getPowerScale(double a) +double CpuTiTgmr::get_power_scale(double a) { - double reduced_a = a - floor(a / lastTime_) * lastTime_; - int point = trace_->binarySearch(trace_->timePoints_, reduced_a, 0, trace_->nbPoints_ - 1); - trace_mgr::DatedValue val = speedTrace_->event_list.at(point); + double reduced_a = a - floor(a / last_time_) * last_time_; + int point = trace_->binary_search(trace_->time_points_, reduced_a, 0, trace_->nb_points_ - 1); + trace_mgr::DatedValue val = speed_trace_->event_list.at(point); return val.value_; } @@ -242,8 +227,7 @@ double CpuTiTgmr::getPowerScale(double a) * \param value Percentage of CPU speed available (useful to fixed tracing) * \return Integration trace structure */ -CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) : - speedTrace_(speedTrace) +CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) : speed_trace_(speedTrace) { double total_time = 0.0; trace_ = 0; @@ -271,10 +255,10 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) : total_time += val.date_; trace_ = new CpuTiTrace(speedTrace); - lastTime_ = total_time; - total_ = trace_->integrateSimple(0, total_time); + last_time_ = total_time; + total_ = trace_->integrate_simple(0, total_time); - XBT_DEBUG("Total integral %f, last_time %f ", total_, lastTime_); + XBT_DEBUG("Total integral %f, last_time %f ", total_, last_time_); } /** @@ -286,7 +270,7 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) : * \param high Upper bound to search in array * \return Index of point */ -int CpuTiTrace::binarySearch(double *array, double a, int low, int high) +int CpuTiTrace::binary_search(double* array, double a, int low, int high) { xbt_assert(low < high, "Wrong parameters: low (%d) should be smaller than high (%d)", low, high); @@ -341,10 +325,10 @@ double CpuTiModel::next_occuring_event(double now) double min_action_duration = -1; /* iterates over modified cpus to update share resources */ - for (auto it = std::begin(modifiedCpu_); it != std::end(modifiedCpu_);) { + for (auto it = std::begin(modified_cpus_); it != std::end(modified_cpus_);) { CpuTi& ti = *it; ++it; // increment iterator here since the following call to ti.updateActionsFinishTime() may invalidate it - ti.updateActionsFinishTime(now); + ti.update_actions_finish_time(now); } /* get the min next event if heap not empty */ @@ -363,7 +347,7 @@ void CpuTiModel::update_actions_state(double now, double /*delta*/) XBT_DEBUG("Action %p: finish", action); action->finish(kernel::resource::Action::State::done); /* update remaining amount of all actions */ - action->cpu_->updateRemainingAmount(surf_get_clock()); + action->cpu_->update_remaining_amount(surf_get_clock()); } } @@ -378,20 +362,20 @@ CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector *s speed_.peak = speedPerPstate->front(); XBT_DEBUG("CPU create: peak=%f", speed_.peak); - speedIntegratedTrace_ = new CpuTiTgmr(nullptr, 1/*scale*/); + speed_integrated_trace_ = new CpuTiTgmr(nullptr, 1 /*scale*/); } CpuTi::~CpuTi() { - modified(false); - delete speedIntegratedTrace_; + set_modified(false); + delete speed_integrated_trace_; } -void CpuTi::setSpeedTrace(tmgr_trace_t trace) +void CpuTi::set_speed_trace(tmgr_trace_t trace) { - if (speedIntegratedTrace_) - delete speedIntegratedTrace_; + if (speed_integrated_trace_) + delete speed_integrated_trace_; - speedIntegratedTrace_ = new CpuTiTgmr(trace, speed_.scale); + speed_integrated_trace_ = new CpuTiTgmr(trace, speed_.scale); /* add a fake trace event if periodicity == 0 */ if (trace && trace->event_list.size() > 1) { @@ -409,19 +393,19 @@ void CpuTi::apply_event(tmgr_trace_event_t event, double value) XBT_DEBUG("Finish trace date: value %f", value); /* update remaining of actions and put in modified cpu list */ - updateRemainingAmount(surf_get_clock()); + update_remaining_amount(surf_get_clock()); - modified(true); + set_modified(true); - speedTrace = speedIntegratedTrace_->speedTrace_; + speedTrace = speed_integrated_trace_->speed_trace_; trace_mgr::DatedValue val = speedTrace->event_list.back(); - delete speedIntegratedTrace_; + delete speed_integrated_trace_; speed_.scale = val.value_; trace = new CpuTiTgmr(TRACE_FIXED, val.value_); XBT_DEBUG("value %f", val.value_); - speedIntegratedTrace_ = trace; + speed_integrated_trace_ = trace; tmgr_trace_event_unref(&speed_.event); @@ -435,7 +419,7 @@ void CpuTi::apply_event(tmgr_trace_event_t event, double value) double date = surf_get_clock(); /* put all action running on cpu to failed */ - for (CpuTiAction& action : actionSet_) { + for (CpuTiAction& action : action_set_) { if (action.get_state() == kernel::resource::Action::State::running || action.get_state() == kernel::resource::Action::State::ready || action.get_state() == kernel::resource::Action::State::not_in_the_system) { @@ -452,15 +436,15 @@ void CpuTi::apply_event(tmgr_trace_event_t event, double value) } } -void CpuTi::updateActionsFinishTime(double now) +/** Update the actions that are running on this CPU (which was modified recently) */ +void CpuTi::update_actions_finish_time(double now) { - double sum_priority = 0.0; - double total_area; - /* update remaining amount of actions */ - updateRemainingAmount(now); + update_remaining_amount(now); - for (CpuTiAction const& action : actionSet_) { + /* Compute the sum of priorities for the actions running on that CPU */ + sum_priority_ = 0.0; + for (CpuTiAction const& action : action_set_) { /* action not running, skip it */ if (action.get_state_set() != surf_cpu_model_pm->get_running_action_set()) continue; @@ -473,11 +457,10 @@ void CpuTi::updateActionsFinishTime(double now) if (action.suspended_ != kernel::resource::Action::SuspendStates::not_suspended) continue; - sum_priority += 1.0 / action.get_priority(); + sum_priority_ += 1.0 / action.get_priority(); } - sumPriority_ = sum_priority; - for (CpuTiAction& action : actionSet_) { + for (CpuTiAction& action : action_set_) { double min_finish = -1; /* action not running, skip it */ if (action.get_state_set() != surf_cpu_model_pm->get_running_action_set()) @@ -486,11 +469,9 @@ void CpuTi::updateActionsFinishTime(double now) /* verify if the action is really running on cpu */ if (action.suspended_ == kernel::resource::Action::SuspendStates::not_suspended && action.get_priority() > 0) { /* total area needed to finish the action. Used in trace integration */ - total_area = (action.get_remains()) * sum_priority * action.get_priority(); - - total_area /= speed_.peak; + double total_area = (action.get_remains() * sum_priority_ * action.get_priority()) / speed_.peak; - action.set_finish_time(speedIntegratedTrace_->solve(now, total_area)); + action.set_finish_time(speed_integrated_trace_->solve(now, total_area)); /* verify which event will happen before (max_duration or finish time) */ if (action.get_max_duration() > NO_MAX_DURATION && action.get_start_time() + action.get_max_duration() < action.get_finish_time()) @@ -512,32 +493,32 @@ void CpuTi::updateActionsFinishTime(double now) &action, action.get_start_time(), action.get_finish_time(), action.get_max_duration()); } /* remove from modified cpu */ - modified(false); + set_modified(false); } -bool CpuTi::isUsed() +bool CpuTi::is_used() { - return not actionSet_.empty(); + return not action_set_.empty(); } -double CpuTi::getAvailableSpeed() +double CpuTi::get_available_speed() { - speed_.scale = speedIntegratedTrace_->getPowerScale(surf_get_clock()); - return Cpu::getAvailableSpeed(); + speed_.scale = speed_integrated_trace_->get_power_scale(surf_get_clock()); + return Cpu::get_available_speed(); } /** @brief Update the remaining amount of actions */ -void CpuTi::updateRemainingAmount(double now) +void CpuTi::update_remaining_amount(double now) { /* already updated */ - if (lastUpdate_ >= now) + if (last_update_ >= now) return; /* compute the integration area */ - double area_total = speedIntegratedTrace_->integrate(lastUpdate_, now) * speed_.peak; - XBT_DEBUG("Flops total: %f, Last update %f", area_total, lastUpdate_); - for (CpuTiAction& action : actionSet_) { + double area_total = speed_integrated_trace_->integrate(last_update_, now) * speed_.peak; + XBT_DEBUG("Flops total: %f, Last update %f", area_total, last_update_); + for (CpuTiAction& action : action_set_) { /* action not running, skip it */ if (action.get_state_set() != model()->get_running_action_set()) continue; @@ -559,10 +540,10 @@ void CpuTi::updateRemainingAmount(double now) continue; /* update remaining */ - action.update_remains(area_total / (sumPriority_ * action.get_priority())); + action.update_remains(area_total / (sum_priority_ * action.get_priority())); XBT_DEBUG("Update remaining action(%p) remaining %f", &action, action.get_remains_no_update()); } - lastUpdate_ = now; + last_update_ = now; } CpuAction *CpuTi::execution_start(double size) @@ -570,7 +551,7 @@ CpuAction *CpuTi::execution_start(double size) XBT_IN("(%s,%g)", getCname(), size); CpuTiAction* action = new CpuTiAction(static_cast(model()), size, isOff(), this); - actionSet_.push_back(*action); + action_set_.push_back(*action); XBT_OUT(); return action; @@ -594,14 +575,15 @@ CpuAction *CpuTi::sleep(double duration) action->get_state_set()->push_back(*action); } - actionSet_.push_back(*action); + action_set_.push_back(*action); XBT_OUT(); return action; } -void CpuTi::modified(bool modified){ - CpuTiList& modifiedCpu = static_cast(model())->modifiedCpu_; +void CpuTi::set_modified(bool modified) +{ + CpuTiList& modifiedCpu = static_cast(model())->modified_cpus_; if (modified) { if (not cpu_ti_hook.is_linked()) { modifiedCpu.push_back(*this); @@ -620,29 +602,29 @@ CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed, CpuTi *cp : CpuAction(model_, cost, failed) , cpu_(cpu) { - cpu_->modified(true); + cpu_->set_modified(true); } CpuTiAction::~CpuTiAction() { /* remove from action_set */ if (action_ti_hook.is_linked()) - simgrid::xbt::intrusive_erase(cpu_->actionSet_, *this); + simgrid::xbt::intrusive_erase(cpu_->action_set_, *this); /* remove from heap */ heapRemove(); - cpu_->modified(true); + cpu_->set_modified(true); } void CpuTiAction::set_state(Action::State state) { CpuAction::set_state(state); - cpu_->modified(true); + cpu_->set_modified(true); } void CpuTiAction::cancel() { this->set_state(Action::State::failed); heapRemove(); - cpu_->modified(true); + cpu_->set_modified(true); } void CpuTiAction::suspend() @@ -651,7 +633,7 @@ void CpuTiAction::suspend() if (suspended_ != Action::SuspendStates::sleeping) { suspended_ = Action::SuspendStates::suspended; heapRemove(); - cpu_->modified(true); + cpu_->set_modified(true); } XBT_OUT(); } @@ -661,7 +643,7 @@ void CpuTiAction::resume() XBT_IN("(%p)", this); if (suspended_ != Action::SuspendStates::sleeping) { suspended_ = Action::SuspendStates::not_suspended; - cpu_->modified(true); + cpu_->set_modified(true); } XBT_OUT(); } @@ -690,14 +672,14 @@ void CpuTiAction::set_priority(double priority) { XBT_IN("(%p,%g)", this, priority); set_priority_no_update(priority); - cpu_->modified(true); + cpu_->set_modified(true); XBT_OUT(); } double CpuTiAction::get_remains() { XBT_IN("(%p)", this); - cpu_->updateRemainingAmount(surf_get_clock()); + cpu_->update_remaining_amount(surf_get_clock()); XBT_OUT(); return get_remains_no_update(); } diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index ec9d0a0118..982727d261 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -19,13 +19,8 @@ namespace surf { /*********** * Classes * ***********/ -class XBT_PRIVATE CpuTiTrace; -class XBT_PRIVATE CpuTiTgmr; class XBT_PRIVATE CpuTiModel; class XBT_PRIVATE CpuTi; -class XBT_PRIVATE CpuTiAction; - -struct tiTag; /********* * Trace * @@ -35,14 +30,14 @@ public: explicit CpuTiTrace(tmgr_trace_t speedTrace); ~CpuTiTrace(); - double integrateSimple(double a, double b); - double integrateSimplePoint(double a); - double solveSimple(double a, double amount); + double integrate_simple(double a, double b); + double integrate_simple_point(double a); + double solve_simple(double a, double amount); - double *timePoints_; + double* time_points_; double *integral_; - int nbPoints_; - int binarySearch(double *array, double a, int low, int high); + int nb_points_; + int binary_search(double* array, double a, int low, int high); }; enum trace_type { @@ -61,18 +56,17 @@ public: double integrate(double a, double b); double solve(double a, double amount); - double solveSomewhatSimple(double a, double amount); - double getPowerScale(double a); + double get_power_scale(double a); trace_type type_; double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */ /* Dynamic */ - double lastTime_ = 0.0; /*< Integral interval last point (discrete time) */ + double last_time_ = 0.0; /*< Integral interval last point (discrete time) */ double total_ = 0.0; /*< Integral total between 0 and last_pointn */ CpuTiTrace *trace_ = nullptr; - tmgr_trace_t speedTrace_ = nullptr; + tmgr_trace_t speed_trace_ = nullptr; }; /********** @@ -106,16 +100,16 @@ typedef boost::intrusive::list ActionTiList; ************/ class CpuTi : public Cpu { public: - CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector *speedPerPstate, int core); + CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core); ~CpuTi() override; - void setSpeedTrace(tmgr_trace_t trace) override; + void set_speed_trace(tmgr_trace_t trace) override; void apply_event(tmgr_trace_event_t event, double value) override; - void updateActionsFinishTime(double now); - void updateRemainingAmount(double now); + void update_actions_finish_time(double now); + void update_remaining_amount(double now); - bool isUsed() override; + bool is_used() override; CpuAction *execution_start(double size) override; simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) override { @@ -123,16 +117,16 @@ public: return nullptr; } CpuAction *sleep(double duration) override; - double getAvailableSpeed() override; + double get_available_speed() override; - void modified(bool modified); + void set_modified(bool modified); - CpuTiTgmr *speedIntegratedTrace_ = nullptr;/*< Structure with data needed to integrate trace file */ - ActionTiList actionSet_; /*< set with all actions running on cpu */ - double sumPriority_ = 0; /*< the sum of actions' priority that are running on cpu */ - double lastUpdate_ = 0; /*< last update of actions' remaining amount done */ + CpuTiTgmr* speed_integrated_trace_ = nullptr; /*< Structure with data needed to integrate trace file */ + ActionTiList action_set_; /*< set with all actions running on cpu */ + double sum_priority_ = 0; /*< the sum of actions' priority that are running on cpu */ + double last_update_ = 0; /*< last update of actions' remaining amount done */ - double currentFrequency_; + double current_frequency_; boost::intrusive::list_member_hook<> cpu_ti_hook; }; @@ -147,12 +141,12 @@ class CpuTiModel : public CpuModel { public: CpuTiModel() = default; ~CpuTiModel() override; - Cpu *createCpu(simgrid::s4u::Host *host, std::vector* speedPerPstate, int core) override; + Cpu* createCpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) override; double next_occuring_event(double now) override; void update_actions_state(double now, double delta) override; kernel::resource::Action::StateSet runningActionSetThatDoesNotNeedBeingChecked_; - CpuTiList modifiedCpu_; + CpuTiList modified_cpus_; }; } diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 950e535ef0..b7efd168f3 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -131,7 +131,7 @@ namespace simgrid { } } - bool LinkImpl::isUsed() + bool LinkImpl::is_used() { return model()->get_maxmin_system()->constraint_used(constraint()); } diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 2565a14104..c26d753636 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -141,7 +141,7 @@ public: virtual int sharingPolicy(); /** @brief Check if the Link is used */ - bool isUsed() override; + bool is_used() override; void turnOn() override; void turnOff() override; diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 94a69e30d3..3a88525fde 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -280,7 +280,8 @@ kernel::resource::Action* CpuL07::sleep(double duration) return action; } -bool CpuL07::isUsed(){ +bool CpuL07::is_used() +{ return model()->get_maxmin_system()->constraint_used(constraint()); } @@ -299,8 +300,8 @@ void CpuL07::onSpeedChange() { Cpu::onSpeedChange(); } - -bool LinkL07::isUsed(){ +bool LinkL07::is_used() +{ return model()->get_maxmin_system()->constraint_used(constraint()); } diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp index 40f54e6295..70d95568da 100644 --- a/src/surf/ptask_L07.hpp +++ b/src/surf/ptask_L07.hpp @@ -73,7 +73,7 @@ class CpuL07 : public Cpu { public: CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, std::vector * speedPerPstate, int core); ~CpuL07() override; - bool isUsed() override; + bool is_used() override; void apply_event(tmgr_trace_event_t event, double value) override; kernel::resource::Action* execution_start(double size) override; simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) override @@ -92,7 +92,7 @@ public: LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy); ~LinkL07() override; - bool isUsed() override; + bool is_used() override; void apply_event(tmgr_trace_event_t event, double value) override; void setBandwidth(double value) override; void setLatency(double value) override; diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 6718257610..dc6fee2084 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -83,7 +83,7 @@ void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) if (args->state_trace) host->pimpl_cpu->setStateTrace(args->state_trace); if (args->speed_trace) - host->pimpl_cpu->setSpeedTrace(args->speed_trace); + host->pimpl_cpu->set_speed_trace(args->speed_trace); if (args->pstate != 0) host->pimpl_cpu->setPState(args->pstate); if (args->coord && strcmp(args->coord, "")) @@ -490,7 +490,7 @@ void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer) if (peer->state_trace) host->pimpl_cpu->setStateTrace(peer->state_trace); if (peer->speed_trace) - host->pimpl_cpu->setSpeedTrace(peer->speed_trace); + host->pimpl_cpu->set_speed_trace(peer->speed_trace); } void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ } diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 968e024a20..e96c017c84 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -108,7 +108,7 @@ double surf_solve(double max_date) XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", time_delta, NOW, next_event_date); while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) { - if (resource->isUsed() || (watched_hosts.find(resource->getCname()) != watched_hosts.end())) { + if (resource->is_used() || (watched_hosts.find(resource->getCname()) != watched_hosts.end())) { time_delta = next_event_date - NOW; XBT_DEBUG("This event invalidates the next_occuring_event() computation of models. Next event set to %f", time_delta); } diff --git a/src/surf/trace_mgr_test.cpp b/src/surf/trace_mgr_test.cpp index fc8601aa5b..decf142eb6 100644 --- a/src/surf/trace_mgr_test.cpp +++ b/src/surf/trace_mgr_test.cpp @@ -27,12 +27,12 @@ double thedate; class MockedResource : public simgrid::kernel::resource::Resource { public: explicit MockedResource() : simgrid::kernel::resource::Resource(nullptr, "fake", nullptr) {} - void apply_event(tmgr_trace_event_t event, double value) + void apply_event(tmgr_trace_event_t event, double value) override { XBT_VERB("t=%.1f: Change value to %lg (idx: %u)", thedate, value, event->idx); tmgr_trace_event_unref(&event); } - bool isUsed() { return true; } + bool is_used() override { return true; } }; static void trace2vector(const char* str, std::vector* whereto) diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp index d287f06c6e..30666535db 100644 --- a/src/surf/xml/surfxml_parseplatf.cpp +++ b/src/surf/xml/surfxml_parseplatf.cpp @@ -133,7 +133,7 @@ void parse_platform_file(const char *file) xbt_assert(host, "Host %s undefined", elm.second.c_str()); simgrid::surf::Cpu* cpu = host->pimpl_cpu; - cpu->setSpeedTrace(trace); + cpu->set_speed_trace(trace); } for (auto const& elm : trace_connect_list_link_avail) { -- 2.20.1