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
cleanups
[simgrid.git]
/
src
/
surf
/
cpu_cas01.cpp
diff --git
a/src/surf/cpu_cas01.cpp
b/src/surf/cpu_cas01.cpp
index
9aae097
..
9694417
100644
(file)
--- a/
src/surf/cpu_cas01.cpp
+++ b/
src/surf/cpu_cas01.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-202
1
. 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. */
/* 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. */
@@
-10,7
+10,7
@@
#include "src/surf/surf_interface.hpp"
#include "surf/surf.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
");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
cpu_cas, res_cpu, "CPU resource, CAS01 model (used by default)
");
/***********
* Options *
/***********
* Options *
@@
-19,7
+19,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the
static simgrid::config::Flag<std::string>
cpu_optim_opt("cpu/optim", "Optimization algorithm to use for CPU resources. ", "Lazy",
static simgrid::config::Flag<std::string>
cpu_optim_opt("cpu/optim", "Optimization algorithm to use for CPU resources. ", "Lazy",
- std::map<std::string, std::string>({
+ std::map<std::string, std::string
, std::less<>
>({
{"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)."},
{"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)."},
@@
-87,14
+87,15
@@
Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed
* Resource *
************/
CpuCas01::CpuCas01(CpuCas01Model* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
* 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)
+ : Cpu(host, speed_per_pstate)
{
{
+ this->set_core_count(core)->set_model(model)->set_constraint(
+ model->get_maxmin_system()->constraint_new(this, core * speed_per_pstate.front()));
}
CpuCas01::~CpuCas01() = default;
}
CpuCas01::~CpuCas01() = default;
-bool CpuCas01::is_used()
+bool CpuCas01::is_used()
const
{
return get_model()->get_maxmin_system()->constraint_used(get_constraint());
}
{
return get_model()->get_maxmin_system()->constraint_used(get_constraint());
}
@@
-133,8
+134,8
@@
void CpuCas01::apply_event(profile::Event* event, double value)
if (value > 0) {
if (not is_on()) {
if (value > 0) {
if (not is_on()) {
- XBT_VERB("Restart actors on host %s", get_
host
()->get_cname());
- get_
host
()->turn_on();
+ XBT_VERB("Restart actors on host %s", get_
iface
()->get_cname());
+ get_
iface
()->turn_on();
}
} else {
const lmm::Constraint* cnst = get_constraint();
}
} else {
const lmm::Constraint* cnst = get_constraint();
@@
-142,7
+143,7
@@
void CpuCas01::apply_event(profile::Event* event, double value)
const lmm::Element* elem = nullptr;
double date = surf_get_clock();
const lmm::Element* elem = nullptr;
double date = surf_get_clock();
- get_
host
()->turn_off();
+ get_
iface
()->turn_off();
while ((var = cnst->get_variable(&elem))) {
Action* action = var->get_id();
while ((var = cnst->get_variable(&elem))) {
Action* action = var->get_id();