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
change simgrid::surf::Resource into simgrid::kernel::model::Resource
[simgrid.git]
/
src
/
surf
/
ptask_L07.cpp
diff --git
a/src/surf/ptask_L07.cpp
b/src/surf/ptask_L07.cpp
index
a1ee65d
..
94ad29d
100644
(file)
--- a/
src/surf/ptask_L07.cpp
+++ b/
src/surf/ptask_L07.cpp
@@
-43,8
+43,6
@@
HostL07Model::HostL07Model() : HostModel() {
HostL07Model::~HostL07Model()
{
HostL07Model::~HostL07Model()
{
- delete maxminSystem_;
- maxminSystem_ = nullptr;
delete surf_network_model;
delete surf_cpu_model_pm;
}
delete surf_network_model;
delete surf_cpu_model_pm;
}
@@
-122,11
+120,11
@@
void HostL07Model::updateActionsState(double /*now*/, double delta)
} else {
/* Need to check that none of the model has failed */
int i = 0;
} else {
/* Need to check that none of the model has failed */
int i = 0;
-
lmm_constraint_t
cnst = action.getVariable()->get_constraint(i);
+
kernel::lmm::Constraint*
cnst = action.getVariable()->get_constraint(i);
while (cnst != nullptr) {
i++;
void* constraint_id = cnst->get_id();
while (cnst != nullptr) {
i++;
void* constraint_id = cnst->get_id();
- if (static_cast<simgrid::
surf
::Resource*>(constraint_id)->isOff()) {
+ if (static_cast<simgrid::
kernel::model
::Resource*>(constraint_id)->isOff()) {
XBT_DEBUG("Action (%p) Failed!!", &action);
action.finish(Action::State::failed);
break;
XBT_DEBUG("Action (%p) Failed!!", &action);
action.finish(Action::State::failed);
break;
@@
-279,7
+277,7
@@
Action *CpuL07::sleep(double duration)
{
L07Action *action = static_cast<L07Action*>(execution_start(1.0));
action->setMaxDuration(duration);
{
L07Action *action = static_cast<L07Action*>(execution_start(1.0));
action->setMaxDuration(duration);
- action->suspended_ =
2
;
+ action->suspended_ =
Action::SuspendStates::sleeping
;
model()->getMaxminSystem()->update_variable_weight(action->getVariable(), 0.0);
return action;
model()->getMaxminSystem()->update_variable_weight(action->getVariable(), 0.0);
return action;
@@
-291,7
+289,7
@@
bool CpuL07::isUsed(){
/** @brief take into account changes of speed (either load or max) */
void CpuL07::onSpeedChange() {
/** @brief take into account changes of speed (either load or max) */
void CpuL07::onSpeedChange() {
-
lmm_variable_t var
= nullptr;
+
kernel::lmm::Variable* var
= nullptr;
const_lmm_element_t elem = nullptr;
model()->getMaxminSystem()->update_constraint_bound(constraint(), speed_.peak * speed_.scale);
const_lmm_element_t elem = nullptr;
model()->getMaxminSystem()->update_constraint_bound(constraint(), speed_.peak * speed_.scale);
@@
-360,7
+358,7
@@
void LinkL07::setBandwidth(double value)
void LinkL07::setLatency(double value)
{
void LinkL07::setLatency(double value)
{
-
lmm_variable_t
var = nullptr;
+
kernel::lmm::Variable*
var = nullptr;
L07Action *action;
const_lmm_element_t elem = nullptr;
L07Action *action;
const_lmm_element_t elem = nullptr;
@@
-404,7
+402,7
@@
void L07Action::updateBound()
}
double lat_bound = sg_tcp_gamma / (2.0 * lat_current);
XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound);
}
double lat_bound = sg_tcp_gamma / (2.0 * lat_current);
XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound);
- if ((latency_ <= 0.0) && (suspended_ ==
0
)) {
+ if ((latency_ <= 0.0) && (suspended_ ==
Action::SuspendStates::not_suspended
)) {
if (rate_ < 0)
getModel()->getMaxminSystem()->update_variable_bound(getVariable(), lat_bound);
else
if (rate_ < 0)
getModel()->getMaxminSystem()->update_variable_bound(getVariable(), lat_bound);
else