-/* Copyright (c) 2009-2011. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "cpu_cas01.hpp"
-#include "cpu_ti.hpp"
-#include "surf.hpp"
-#include "maxmin_private.h"
-#include "simgrid/sg_config.h"
-
-extern "C" {
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf,
- "Logging specific to the SURF CPU IMPROVED module");
-}
+#include "simgrid/sg_config.hpp"
+#include "src/kernel/resource/profile/Event.hpp"
+#include "src/surf/cpu_ti.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU module");
+
+/***********
+ * Options *
+ ***********/
+
+static simgrid::config::Flag<std::string>
+ cpu_optim_opt("cpu/optim", "Optimization algorithm to use for CPU resources. ", "Lazy",
-static xbt_swag_t
- cpu_running_action_set_that_does_not_need_being_checked = NULL;
+ std::map<std::string, std::string>({
+ {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining)."},
+ {"TI", "Trace integration. Highly optimized mode when using availability traces (only available "
+ "for the Cas01 CPU model for now)."},
+ {"Full", "Full update of remaining and variables. Slow but may be useful when debugging."},
+ }),
+
+ [](std::string const&) {
+ xbt_assert(_sg_cfg_init_status < 2,
+ "Cannot change the optimization algorithm after the initialization");
+ });
/*********
* Model *
*********/
void surf_cpu_model_init_Cas01()
{
- char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
-
- if (surf_cpu_model)
- return;
+ xbt_assert(surf_cpu_model_pm == nullptr, "CPU model already initialized. This should not happen.");
+ xbt_assert(surf_cpu_model_vm == nullptr, "CPU model already initialized. This should not happen.");
- if (!strcmp(optim, "TI")) {
- surf_cpu_model = new CpuTiModel();
+ if (cpu_optim_opt == "TI") {
+ simgrid::kernel::resource::CpuTiModel::create_pm_vm_models();
return;
}
- surf_cpu_model = new CpuCas01Model();
- xbt_dynar_push(model_list, &surf_cpu_model);
-}
+ simgrid::kernel::resource::Model::UpdateAlgo algo;
+ if (cpu_optim_opt == "Lazy")
+ algo = simgrid::kernel::resource::Model::UpdateAlgo::LAZY;
+ else
+ algo = simgrid::kernel::resource::Model::UpdateAlgo::FULL;
-CpuCas01Model::CpuCas01Model() : CpuModel("cpu")
-{
- CpuCas01ActionLmm action;
-
- char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
- int select = xbt_cfg_get_boolean(_sg_cfg_set, "cpu/maxmin_selective_update");
-
- if (!strcmp(optim, "Full")) {
- p_updateMechanism = UM_FULL;
- m_selectiveUpdate = select;
- } else if (!strcmp(optim, "Lazy")) {
- p_updateMechanism = UM_LAZY;
- m_selectiveUpdate = 1;
- xbt_assert((select == 1)
- ||
- (xbt_cfg_is_default_value
- (_sg_cfg_set, "cpu/maxmin_selective_update")),
- "Disabling selective update while using the lazy update mechanism is dumb!");
- } else {
- xbt_die("Unsupported optimization (%s) for this model", optim);
- }
+ surf_cpu_model_pm = new simgrid::kernel::resource::CpuCas01Model(algo);
+ surf_cpu_model_vm = new simgrid::kernel::resource::CpuCas01Model(algo);
+}
- cpu_running_action_set_that_does_not_need_being_checked =
- xbt_swag_new(xbt_swag_offset(action, p_stateHookup));
+namespace simgrid {
+namespace kernel {
+namespace resource {
- if (p_updateMechanism == UM_LAZY) {
- shareResources = &CpuCas01Model::shareResourcesLazy;
- updateActionsState = &CpuCas01Model::updateActionsStateLazy;
+CpuCas01Model::CpuCas01Model(Model::UpdateAlgo algo) : CpuModel(algo)
+{
+ all_existing_models.push_back(this);
- } else if (p_updateMechanism == UM_FULL) {
- shareResources = &CpuCas01Model::shareResourcesFull;
- updateActionsState = &CpuCas01Model::updateActionsStateFull;
- } else
- xbt_die("Invalid cpu update mechanism!");
+ bool select = config::get_value<bool>("cpu/maxmin-selective-update");
- if (!p_maxminSystem) {
- p_maxminSystem = lmm_system_new(m_selectiveUpdate);
+ if (is_update_lazy()) {
+ xbt_assert(select || config::is_default("cpu/maxmin-selective-update"),
+ "You cannot disable cpu selective update when using the lazy update mechanism");
+ select = true;
}
- if (p_updateMechanism == UM_LAZY) {
- p_actionHeap = xbt_heap_new(8, NULL);
- xbt_heap_set_update_callback(p_actionHeap, surf_action_lmm_update_index_heap);
- p_modifiedSet = xbt_swag_new(xbt_swag_offset(action, p_actionListHookup));
- //TOREPAIR: cpu_model->model_private->maxmin_system->m_keepTrack = cpu_model->model_private->modified_set;
- }
- /* Define callbacks */
- //TODO sg_platf_host_add_cb(parse_cpu_init);
- //TODO sg_platf_postparse_add_cb(cpu_add_traces_cpu);
+ set_maxmin_system(new lmm::System(select));
}
CpuCas01Model::~CpuCas01Model()
{
- lmm_system_free(p_maxminSystem);
- p_maxminSystem = NULL;
-
- if (p_actionHeap)
- xbt_heap_free(p_actionHeap);
- xbt_swag_free(p_modifiedSet);
-
- surf_cpu_model = NULL;
-
- xbt_swag_free(cpu_running_action_set_that_does_not_need_being_checked);
- cpu_running_action_set_that_does_not_need_being_checked = NULL;
+ surf_cpu_model_pm = nullptr;
}
-void CpuCas01Model::parseInit(sg_platf_host_cbarg_t host)
+Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
{
- createResource(host->id,
- host->power_peak,
- host->power_scale,
- host->power_trace,
- host->core_amount,
- host->initial_state,
- host->state_trace,
- host->properties);
+ return new CpuCas01(this, host, speed_per_pstate, core);
}
-CpuCas01LmmPtr CpuCas01Model::createResource(const char *name, double power_peak, double power_scale,
- tmgr_trace_t power_trace, int core,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties)
-{
- CpuCas01LmmPtr cpu = NULL;
-
- xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)),
- "Host '%s' declared several times in the platform file",
- name);
- xbt_assert(power_peak > 0, "Power has to be >0");
- xbt_assert(core > 0, "Invalid number of cores %d", core);
-
- cpu = new CpuCas01Lmm(this, name, power_peak, power_scale, power_trace, core, state_initial, state_trace, cpu_properties);
- xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, this);
-
- return (CpuCas01LmmPtr) xbt_lib_get_elm_or_null(host_lib, name);;
+/************
+ * Resource *
+ ************/
+CpuCas01::CpuCas01(CpuCas01Model* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
+ : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, core * speed_per_pstate.front()),
+ speed_per_pstate, core)
+{
}
-double CpuCas01Model::shareResourcesFull(double now)
+CpuCas01::~CpuCas01() = default;
+
+bool CpuCas01::is_used()
{
- CpuCas01ActionLmm action;
- Model::shareResourcesMaxMin(p_runningActionSet,
- xbt_swag_offset(action, p_variable),
- p_maxminSystem, lmm_solve);
- return 0;
+ return get_model()->get_maxmin_system()->constraint_used(get_constraint());
}
-void CpuCas01Model::addTraces()
+/** @brief take into account changes of speed (either load or max) */
+void CpuCas01::on_speed_change()
{
- xbt_dict_cursor_t cursor = NULL;
- char *trace_name, *elm;
- static int called = 0;
- if (called)
- return;
- called = 1;
-
- /* connect all traces relative to hosts */
- xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
- tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuCas01LmmPtr host = (CpuCas01LmmPtr) surf_cpu_resource_by_name(elm);
-
- xbt_assert(host, "Host %s undefined", elm);
- xbt_assert(trace, "Trace %s undefined", trace_name);
-
- host->p_stateEvent =
- tmgr_history_add_trace(history, trace, 0.0, 0, host);
- }
+ const lmm::Variable* var;
+ const lmm::Element* elem = nullptr;
- xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
- tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuCas01LmmPtr host = (CpuCas01LmmPtr) surf_cpu_resource_by_name(elm);
+ get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
+ get_core_count() * speed_.scale * speed_.peak);
+ while ((var = get_constraint()->get_variable(&elem))) {
+ auto* action = static_cast<CpuCas01Action*>(var->get_id());
- xbt_assert(host, "Host %s undefined", elm);
- xbt_assert(trace, "Trace %s undefined", trace_name);
-
- host->p_powerEvent =
- tmgr_history_add_trace(history, trace, 0.0, 0, host);
+ get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(),
+ action->requested_core() * speed_.scale * speed_.peak);
}
-}
-/************
- * Resource *
- ************/
-CpuCas01Lmm::CpuCas01Lmm(CpuCas01ModelPtr model, const char *name, double powerPeak,
- double powerScale, tmgr_trace_t powerTrace, int core,
- e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
- xbt_dict_t properties) :
- CpuLmm(model, name, properties) {
- m_powerPeak = powerPeak;
- m_powerScale = powerScale;
- m_core = core;
- p_stateCurrent = stateInitial;
- if (powerTrace)
- 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, this);
-
- p_constraint = lmm_constraint_new(p_model->p_maxminSystem, this, m_core * m_powerScale * m_powerPeak);
+ Cpu::on_speed_change();
}
-bool CpuCas01Lmm::isUsed()
+void CpuCas01::apply_event(profile::Event* event, double value)
{
- return lmm_constraint_used(p_model->p_maxminSystem, p_constraint);
-}
+ if (event == speed_.event) {
+ /* TODO (Hypervisor): do the same thing for constraint_core[i] */
+ xbt_assert(get_core_count() == 1, "FIXME: add speed scaling code also for constraint_core[i]");
+
+ speed_.scale = value;
+ on_speed_change();
+
+ tmgr_trace_event_unref(&speed_.event);
+ } else if (event == state_event_) {
+ /* TODO (Hypervisor): do the same thing for constraint_core[i] */
+ xbt_assert(get_core_count() == 1, "FIXME: add state change code also for constraint_core[i]");
+
+ if (value > 0) {
+ if (not is_on()) {
+ XBT_VERB("Restart actors on host %s", get_host()->get_cname());
+ get_host()->turn_on();
+ }
+ } else {
+ const lmm::Constraint* cnst = get_constraint();
+ const lmm::Variable* var;
+ const lmm::Element* elem = nullptr;
+ double date = surf_get_clock();
-void CpuCas01Lmm::updateState(tmgr_trace_event_t event_type, double value, double date)
-{
- lmm_variable_t var = NULL;
- lmm_element_t elem = NULL;
-
- surf_watched_hosts();
-
- if (event_type == p_powerEvent) {
- m_powerScale = value;
- lmm_update_constraint_bound(surf_cpu_model->p_maxminSystem, p_constraint,
- m_core * m_powerScale *
- m_powerPeak);
-#ifdef HAVE_TRACING
- TRACE_surf_host_set_power(date, m_name,
- m_core * m_powerScale *
- m_powerPeak);
-#endif
- while ((var = lmm_get_var_from_cnst
- (surf_cpu_model->p_maxminSystem, p_constraint, &elem))) {
- CpuCas01ActionLmmPtr action = (CpuCas01ActionLmmPtr) lmm_variable_id(var);
- lmm_update_variable_bound(surf_cpu_model->p_maxminSystem,
- action->p_variable,
- m_powerScale * m_powerPeak);
- }
- if (tmgr_trace_event_free(event_type))
- p_powerEvent = NULL;
- } else if (event_type == p_stateEvent) {
- if (value > 0)
- p_stateCurrent = SURF_RESOURCE_ON;
- else {
- lmm_constraint_t cnst = p_constraint;
-
- p_stateCurrent = SURF_RESOURCE_OFF;
-
- while ((var = lmm_get_var_from_cnst(surf_cpu_model->p_maxminSystem, cnst, &elem))) {
- ActionPtr action = (ActionPtr) lmm_variable_id(var);
-
- if (action->getState() == SURF_ACTION_RUNNING ||
- action->getState() == SURF_ACTION_READY ||
- action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) {
- action->m_finish = date;
- action->setState(SURF_ACTION_FAILED);
+ get_host()->turn_off();
+
+ while ((var = cnst->get_variable(&elem))) {
+ auto* action = static_cast<Action*>(var->get_id());
+
+ if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED ||
+ action->get_state() == Action::State::IGNORED) {
+ action->set_finish_time(date);
+ action->set_state(Action::State::FAILED);
}
}
}
- if (tmgr_trace_event_free(event_type))
- p_stateEvent = NULL;
+ tmgr_trace_event_unref(&state_event_);
+
} else {
- XBT_CRITICAL("Unknown event ! \n");
- xbt_abort();
+ xbt_die("Unknown event!\n");
}
-
- return;
}
-CpuActionPtr CpuCas01Lmm::execute(double size)
+/** @brief Start a new execution on this CPU lasting @param size flops and using one core */
+CpuAction* CpuCas01::execution_start(double size)
{
+ return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint());
+}
- XBT_IN("(%s,%g)", m_name, size);
- CpuCas01ActionLmmPtr action = new CpuCas01ActionLmm(surf_cpu_model, size, p_stateCurrent != SURF_RESOURCE_ON);
-
- action->m_suspended = 0; /* Should be useless because of the
- calloc but it seems to help valgrind... */
-
- action->p_variable =
- lmm_variable_new(surf_cpu_model->p_maxminSystem, action,
- action->m_priority,
- m_powerScale * m_powerPeak, 1);
- if (surf_cpu_model->p_updateMechanism == UM_LAZY) {
- action->m_indexHeap = -1;
- action->m_lastUpdate = surf_get_clock();
- action->m_lastValue = 0.0;
- }
- lmm_expand(surf_cpu_model->p_maxminSystem, p_constraint,
- action->p_variable, 1.0);
- XBT_OUT();
- return action;
+CpuAction* CpuCas01::execution_start(double size, int requested_cores)
+{
+ return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint(),
+ requested_cores);
}
-CpuActionPtr CpuCas01Lmm::sleep(double duration)
+CpuAction* CpuCas01::sleep(double duration)
{
if (duration > 0)
- duration = MAX(duration, MAXMIN_PRECISION);
-
- XBT_IN("(%s,%g)", m_name, duration);
- CpuCas01ActionLmmPtr action = (CpuCas01ActionLmmPtr) execute(1.0);
-
- // FIXME: sleep variables should not consume 1.0 in lmm_expand
- action->m_maxDuration = duration;
- action->m_suspended = 2;
- if (duration == NO_MAX_DURATION) {
- /* Move to the *end* of the corresponding action set. This convention
- is used to speed up update_resource_state */
- xbt_swag_remove(action, action->p_stateSet);
- action->p_stateSet = cpu_running_action_set_that_does_not_need_being_checked;
- xbt_swag_insert(action, action->p_stateSet);
- }
-
- lmm_update_variable_weight(surf_cpu_model->p_maxminSystem,
- action->p_variable, 0.0);
- if (surf_cpu_model->p_updateMechanism == UM_LAZY) { // remove action from the heap
- action->heapRemove(surf_cpu_model->p_actionHeap);
- // 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
- xbt_swag_insert_at_head(action, surf_cpu_model->p_modifiedSet);
+ duration = std::max(duration, sg_surf_precision);
+
+ XBT_IN("(%s,%g)", get_cname(), duration);
+ auto* action = new CpuCas01Action(get_model(), 1.0, not is_on(), speed_.scale * speed_.peak, get_constraint());
+
+ // FIXME: sleep variables should not consume 1.0 in System::expand()
+ action->set_max_duration(duration);
+ action->set_suspend_state(Action::SuspendStates::SLEEPING);
+ if (duration == NO_MAX_DURATION)
+ action->set_state(Action::State::IGNORED);
+
+ get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), 0.0);
+ if (get_model()->is_update_lazy()) { // remove action from the heap
+ get_model()->get_action_heap().remove(action);
+ // 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
+ get_model()->get_modified_set()->push_front(*action);
}
XBT_OUT();
return action;
}
-
/**********
* Action *
**********/
+CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint,
+ int requested_core)
+ : CpuAction(model, cost, failed,
+ model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1))
+ , requested_core_(requested_core)
+{
+ if (model->is_update_lazy())
+ set_last_update();
+ model->get_maxmin_system()->expand(constraint, get_variable(), 1.0);
+}
+
+CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint)
+ : CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1)
+{
+}
+
+int CpuCas01Action::requested_core()
+{
+ return requested_core_;
+}
+CpuCas01Action::~CpuCas01Action()=default;
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid