-/* Copyright (c) 2009-2011. The SimGrid Team.
+/* Copyright (c) 2009-2011, 2013-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "cpu_cas01.hpp"
#include "cpu_ti.hpp"
-#include "surf.hpp"
-#include "maxmin_private.h"
+#include "maxmin_private.hpp"
#include "simgrid/sg_config.h"
-extern "C" {
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf,
- "Logging specific to the SURF CPU IMPROVED module");
-}
-
-static xbt_swag_t
- cpu_running_action_set_that_does_not_need_being_checked = NULL;
-
-/*************
- * CallBacks *
- *************/
-
-static void parse_cpu_init(sg_platf_host_cbarg_t host){
- ((CpuCas01ModelPtr)surf_cpu_model)->parseInit(host);
-}
-
-static void cpu_add_traces_cpu(){
- surf_cpu_model->addTraces();
-}
-
-static void cpu_define_callbacks()
-{
- sg_platf_host_add_cb(parse_cpu_init);
- sg_platf_postparse_add_cb(cpu_add_traces_cpu);
-}
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module");
/*********
* 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(not surf_cpu_model_pm);
+ xbt_assert(not surf_cpu_model_vm);
- if (!strcmp(optim, "TI")) {
- surf_cpu_model = new CpuTiModel();
+ if (xbt_cfg_get_string("cpu/optim") == "TI") {
+ surf_cpu_model_init_ti();
return;
}
- surf_cpu_model = new CpuCas01Model();
- cpu_define_callbacks();
- ModelPtr model = static_cast<ModelPtr>(surf_cpu_model);
- xbt_dynar_push(model_list, &model);
+ surf_cpu_model_pm = new simgrid::surf::CpuCas01Model();
+ all_existing_models->push_back(surf_cpu_model_pm);
+
+ surf_cpu_model_vm = new simgrid::surf::CpuCas01Model();
+ all_existing_models->push_back(surf_cpu_model_vm);
}
-CpuCas01Model::CpuCas01Model() : CpuModel("cpu")
+namespace simgrid {
+namespace surf {
+
+CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel()
{
- ActionPtr action;
- ActionLmmPtr actionlmm;
-
- 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")),
+ std::string optim = xbt_cfg_get_string("cpu/optim");
+ bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update");
+
+ if (optim == "Full") {
+ setUpdateMechanism(UM_FULL);
+ selectiveUpdate_ = select;
+ } else if (optim == "Lazy") {
+ setUpdateMechanism(UM_LAZY);
+ selectiveUpdate_ = true;
+ xbt_assert(select || (xbt_cfg_is_default_value("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);
+ xbt_die("Unsupported optimization (%s) for this model", optim.c_str());
}
- cpu_running_action_set_that_does_not_need_being_checked =
- xbt_swag_new(xbt_swag_offset(*action, p_stateHookup));
-
- if (p_updateMechanism == UM_LAZY) {
- shareResources = &CpuCas01Model::shareResourcesLazy;
- updateActionsState = &CpuCas01Model::updateActionsStateLazy;
-
- } else if (p_updateMechanism == UM_FULL) {
- shareResources = &CpuCas01Model::shareResourcesFull;
- updateActionsState = &CpuCas01Model::updateActionsStateFull;
- } else
- xbt_die("Invalid cpu update mechanism!");
+ p_cpuRunningActionSetThatDoesNotNeedBeingChecked = new ActionList();
+ maxminSystem_ = lmm_system_new(selectiveUpdate_);
- if (!p_maxminSystem) {
- p_maxminSystem = lmm_system_new(m_selectiveUpdate);
- }
-
- 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(*actionlmm, p_actionListHookup));
- p_maxminSystem->keep_track = p_modifiedSet;
+ if (getUpdateMechanism() == UM_LAZY) {
+ actionHeap_ = xbt_heap_new(8, nullptr);
+ xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap);
+ modifiedSet_ = new ActionLmmList();
+ maxminSystem_->keep_track = modifiedSet_;
}
}
CpuCas01Model::~CpuCas01Model()
{
- lmm_system_free(p_maxminSystem);
- p_maxminSystem = NULL;
+ lmm_system_free(maxminSystem_);
+ maxminSystem_ = nullptr;
+ xbt_heap_free(actionHeap_);
+ delete modifiedSet_;
- if (p_actionHeap)
- xbt_heap_free(p_actionHeap);
- xbt_swag_free(p_modifiedSet);
+ surf_cpu_model_pm = nullptr;
- 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;
+ delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
}
-void CpuCas01Model::parseInit(sg_platf_host_cbarg_t host)
-{
- createResource(host->id,
- host->power_peak,
- host->power_scale,
- host->power_trace,
- host->core_amount,
- host->initial_state,
- host->state_trace,
- host->properties);
-}
-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)
+Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core)
{
- CpuPtr 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, static_cast<ResourcePtr>(cpu));
-
- return (CpuCas01LmmPtr) xbt_lib_get_elm_or_null(host_lib, name);
+ return new CpuCas01(this, host, speedPerPstate, core);
}
-double CpuCas01Model::shareResourcesFull(double now)
+/************
+ * Resource *
+ ************/
+CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core)
+: Cpu(model, host, lmm_constraint_new(model->getMaxminSystem(), this, core * speedPerPstate->front()),
+ speedPerPstate, core)
{
- CpuCas01ActionLmm action;
- Model::shareResourcesMaxMin(p_runningActionSet,
- xbt_swag_offset(action, p_variable),
- p_maxminSystem, lmm_solve);
- return 0;
}
-void CpuCas01Model::addTraces()
+CpuCas01::~CpuCas01()
{
- 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_priv(surf_cpu_resource_by_name(elm));
+ if (model() == surf_cpu_model_pm)
+ speedPerPstate_.clear();
+}
- xbt_assert(host, "Host %s undefined", elm);
- xbt_assert(trace, "Trace %s undefined", trace_name);
+std::vector<double> * CpuCas01::getSpeedPeakList(){
+ return &speedPerPstate_;
+}
- host->p_stateEvent =
- tmgr_history_add_trace(history, trace, 0.0, 0, (ResourcePtr) host);
- }
+bool CpuCas01::isUsed()
+{
+ return lmm_constraint_used(model()->getMaxminSystem(), constraint());
+}
- 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_priv(surf_cpu_resource_by_name(elm));
+/** @brief take into account changes of speed (either load or max) */
+void CpuCas01::onSpeedChange() {
+ lmm_variable_t var = nullptr;
+ lmm_element_t elem = nullptr;
- xbt_assert(host, "Host %s undefined", elm);
- xbt_assert(trace, "Trace %s undefined", trace_name);
+ lmm_update_constraint_bound(model()->getMaxminSystem(), constraint(), coresAmount_ * speed_.scale * speed_.peak);
+ while ((var = lmm_get_var_from_cnst(model()->getMaxminSystem(), constraint(), &elem))) {
+ CpuCas01Action* action = static_cast<CpuCas01Action*>(lmm_variable_id(var));
- host->p_powerEvent =
- tmgr_history_add_trace(history, trace, 0.0, 0, (ResourcePtr) host);
+ lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(),
+ action->requestedCore() * 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), Resource(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, static_cast<ResourcePtr>(this));
-
- if (stateTrace)
- p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, static_cast<ResourcePtr>(this));
-
- p_constraint = lmm_constraint_new(p_model->p_maxminSystem, this, m_core * m_powerScale * m_powerPeak);
-}
-bool CpuCas01Lmm::isUsed()
-{
- return lmm_constraint_used(p_model->p_maxminSystem, p_constraint);
+ Cpu::onSpeedChange();
}
-void CpuCas01Lmm::updateState(tmgr_trace_event_t event_type, double value, double date)
+void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
{
- 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 = static_cast<CpuCas01ActionLmmPtr>(static_cast<ActionLmmPtr>(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))) {
- ActionLmmPtr action = static_cast<ActionLmmPtr>(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);
+ if (event == speed_.event) {
+ /* TODO (Hypervisor): do the same thing for constraint_core[i] */
+ xbt_assert(coresAmount_ == 1, "FIXME: add speed scaling code also for constraint_core[i]");
+
+ speed_.scale = value;
+ onSpeedChange();
+
+ tmgr_trace_event_unref(&speed_.event);
+ } else if (event == stateEvent_) {
+ /* TODO (Hypervisor): do the same thing for constraint_core[i] */
+ xbt_assert(coresAmount_ == 1, "FIXME: add state change code also for constraint_core[i]");
+
+ if (value > 0) {
+ if(isOff())
+ host_that_restart.push_back(getHost());
+ turnOn();
+ } else {
+ lmm_constraint_t cnst = constraint();
+ lmm_variable_t var = nullptr;
+ lmm_element_t elem = nullptr;
+ double date = surf_get_clock();
+
+ turnOff();
+
+ while ((var = lmm_get_var_from_cnst(model()->getMaxminSystem(), cnst, &elem))) {
+ Action *action = static_cast<Action*>(lmm_variable_id(var));
+
+ if (action->getState() == Action::State::running ||
+ action->getState() == Action::State::ready ||
+ action->getState() == Action::State::not_in_the_system) {
+ action->setFinishTime(date);
+ action->setState(Action::State::failed);
}
}
}
- if (tmgr_trace_event_free(event_type))
- p_stateEvent = NULL;
+ tmgr_trace_event_unref(&stateEvent_);
+
} else {
- XBT_CRITICAL("Unknown event ! \n");
- xbt_abort();
+ xbt_die("Unknown event!\n");
}
-
- return;
}
-ActionPtr 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)
{
-
- 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, static_cast<ActionLmmPtr>(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;
+ return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint());
+}
+CpuAction* CpuCas01::execution_start(double size, int requestedCores)
+{
+ return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint(), requestedCores);
}
-ActionPtr CpuCas01Lmm::sleep(double duration)
+CpuAction *CpuCas01::sleep(double duration)
{
if (duration > 0)
- duration = MAX(duration, MAXMIN_PRECISION);
+ duration = MAX(duration, sg_surf_precision);
- XBT_IN("(%s,%g)", m_name, duration);
- CpuCas01ActionLmmPtr action = dynamic_cast<CpuCas01ActionLmmPtr>(execute(1.0));
+ XBT_IN("(%s,%g)", getCname(), duration);
+ CpuCas01Action* action = new CpuCas01Action(model(), 1.0, isOff(), speed_.scale * speed_.peak, constraint());
// 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(static_cast<ActionPtr>(action), action->p_stateSet);
- action->p_stateSet = cpu_running_action_set_that_does_not_need_being_checked;
- xbt_swag_insert(static_cast<ActionPtr>(action), action->p_stateSet);
+ action->setMaxDuration(duration);
+ action->suspended_ = 2;
+ if (duration < 0) { // NO_MAX_DURATION
+ /* Move to the *end* of the corresponding action set. This convention is used to speed up update_resource_state */
+ action->getStateSet()->erase(action->getStateSet()->iterator_to(*action));
+ action->stateSet_ = static_cast<CpuCas01Model*>(model())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+ action->getStateSet()->push_back(*action);
}
- 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(static_cast<ActionLmmPtr>(action), surf_cpu_model->p_modifiedSet);
+ lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), 0.0);
+ if (model()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap
+ action->heapRemove(model()->getActionHeap());
+ // 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
+ model()->getModifiedSet()->push_front(*action);
}
XBT_OUT();
return action;
}
-
/**********
* Action *
**********/
+CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint,
+ int requestedCore)
+ : CpuAction(model, cost, failed,
+ lmm_variable_new(model->getMaxminSystem(), this, 1.0 / requestedCore, requestedCore * speed, 1))
+ , requestedCore_(requestedCore)
+{
+ if (model->getUpdateMechanism() == UM_LAZY) {
+ updateIndexHeap(-1);
+ refreshLastUpdate();
+ setLastValue(0.0);
+ }
+ lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0);
+}
+CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint)
+ : CpuCas01Action(model, cost, failed, speed, constraint, 1)
+{
+}
+
+int CpuCas01Action::requestedCore()
+{
+ return requestedCore_;
+}
+CpuCas01Action::~CpuCas01Action()=default;
+
+}
+}
