A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Actually, SMPI is playing by the rules now. Remove friendship
[simgrid.git]
/
src
/
surf
/
cpu_cas01.cpp
diff --git
a/src/surf/cpu_cas01.cpp
b/src/surf/cpu_cas01.cpp
index
0b61967
..
2c9e268
100644
(file)
--- a/
src/surf/cpu_cas01.cpp
+++ b/
src/surf/cpu_cas01.cpp
@@
-5,6
+5,7
@@
#include "cpu_cas01.hpp"
#include "simgrid/sg_config.hpp"
#include "cpu_cas01.hpp"
#include "simgrid/sg_config.hpp"
+#include "src/surf/cpu_ti.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
@@
-34,19
+35,19
@@
static simgrid::config::Flag<std::string>
*********/
void surf_cpu_model_init_Cas01()
{
*********/
void surf_cpu_model_init_Cas01()
{
- xbt_assert(
not surf_cpu_model_pm
);
- xbt_assert(
not surf_cpu_model_vm
);
+ 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 (cpu_optim_opt == "TI") {
if (cpu_optim_opt == "TI") {
- s
urf_cpu_model_init_ti
();
+ s
imgrid::surf::CpuTiModel::create_pm_vm_models
();
return;
}
simgrid::kernel::resource::Model::UpdateAlgo algo;
if (cpu_optim_opt == "Lazy")
return;
}
simgrid::kernel::resource::Model::UpdateAlgo algo;
if (cpu_optim_opt == "Lazy")
- algo = simgrid::kernel::resource::Model::UpdateAlgo::L
azy
;
+ algo = simgrid::kernel::resource::Model::UpdateAlgo::L
AZY
;
else
else
- algo = simgrid::kernel::resource::Model::UpdateAlgo::F
ull
;
+ algo = simgrid::kernel::resource::Model::UpdateAlgo::F
ULL
;
surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(algo);
all_existing_models->push_back(surf_cpu_model_pm);
surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(algo);
all_existing_models->push_back(surf_cpu_model_pm);
@@
-62,7
+63,7
@@
CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : simgrid
{
bool select = simgrid::config::get_value<bool>("cpu/maxmin-selective-update");
{
bool select = simgrid::config::get_value<bool>("cpu/maxmin-selective-update");
- if (algo == Model::UpdateAlgo::L
azy
) {
+ if (algo == Model::UpdateAlgo::L
AZY
) {
xbt_assert(select || simgrid::config::is_default("cpu/maxmin-selective-update"),
"You cannot disable cpu selective update when using the lazy update mechanism");
select = true;
xbt_assert(select || simgrid::config::is_default("cpu/maxmin-selective-update"),
"You cannot disable cpu selective update when using the lazy update mechanism");
select = true;
@@
-76,9
+77,9
@@
CpuCas01Model::~CpuCas01Model()
surf_cpu_model_pm = nullptr;
}
surf_cpu_model_pm = nullptr;
}
-Cpu
*CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerP
state, int core)
+Cpu
* CpuCas01Model::create_cpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_p
state, int core)
{
{
- return new CpuCas01(this, host, speed
PerP
state, core);
+ return new CpuCas01(this, host, speed
_per_p
state, core);
}
/************
}
/************
@@
-90,15
+91,7
@@
CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector<d
{
}
{
}
-CpuCas01::~CpuCas01()
-{
- if (get_model() == surf_cpu_model_pm)
- speed_per_pstate_.clear();
-}
-
-std::vector<double> * CpuCas01::getSpeedPeakList(){
- return &speed_per_pstate_;
-}
+CpuCas01::~CpuCas01() = default;
bool CpuCas01::is_used()
{
bool CpuCas01::is_used()
{
@@
-106,12
+99,13
@@
bool CpuCas01::is_used()
}
/** @brief take into account changes of speed (either load or max) */
}
/** @brief take into account changes of speed (either load or max) */
-void CpuCas01::onSpeedChange() {
+void CpuCas01::on_speed_change()
+{
kernel::lmm::Variable* var = nullptr;
const kernel::lmm::Element* elem = nullptr;
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
kernel::lmm::Variable* var = nullptr;
const kernel::lmm::Element* elem = nullptr;
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
- get_core
s
_count() * speed_.scale * speed_.peak);
+ get_core_count() * speed_.scale * speed_.peak);
while ((var = get_constraint()->get_variable(&elem))) {
CpuCas01Action* action = static_cast<CpuCas01Action*>(var->get_id());
while ((var = get_constraint()->get_variable(&elem))) {
CpuCas01Action* action = static_cast<CpuCas01Action*>(var->get_id());
@@
-119,22
+113,22
@@
void CpuCas01::onSpeedChange() {
action->requested_core() * speed_.scale * speed_.peak);
}
action->requested_core() * speed_.scale * speed_.peak);
}
- Cpu::on
SpeedC
hange();
+ Cpu::on
_speed_c
hange();
}
void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
{
if (event == speed_.event) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
}
void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
{
if (event == speed_.event) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
- xbt_assert(get_core
s
_count() == 1, "FIXME: add speed scaling code also for constraint_core[i]");
+ xbt_assert(get_core_count() == 1, "FIXME: add speed scaling code also for constraint_core[i]");
speed_.scale = value;
speed_.scale = value;
- on
SpeedC
hange();
+ on
_speed_c
hange();
tmgr_trace_event_unref(&speed_.event);
} else if (event == state_event_) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
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
s
_count() == 1, "FIXME: add state change code also for constraint_core[i]");
+ xbt_assert(get_core_count() == 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
if (is_off())
if (value > 0) {
if (is_off())
@@
-192,7
+186,7
@@
CpuAction *CpuCas01::sleep(double duration)
action->set_state(simgrid::kernel::resource::Action::State::IGNORED);
get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0);
action->set_state(simgrid::kernel::resource::Action::State::IGNORED);
get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0);
- if (get_model()->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::L
azy
) { // remove action from the heap
+ if (get_model()->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::L
AZY
) { // 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_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
@@
-212,7
+206,7
@@
CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool
model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1))
, requested_core_(requested_core)
{
model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1))
, requested_core_(requested_core)
{
- if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::L
azy
)
+ if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::L
AZY
)
set_last_update();
model->get_maxmin_system()->expand(constraint, get_variable(), 1.0);
}
set_last_update();
model->get_maxmin_system()->expand(constraint, get_variable(), 1.0);
}