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
[mc] Use member hooks for CpuTi
[simgrid.git]
/
src
/
surf
/
cpu_ti.cpp
diff --git
a/src/surf/cpu_ti.cpp
b/src/surf/cpu_ti.cpp
index
2edf742
..
21f92c5
100644
(file)
--- a/
src/surf/cpu_ti.cpp
+++ b/
src/surf/cpu_ti.cpp
@@
-836,11
+836,11
@@
CpuAction *CpuTi::sleep(double duration)
void CpuTi::modified(bool modified){
CpuTiList *modifiedCpu = static_cast<CpuTiModel*>(getModel())->p_modifiedCpu;
if (modified) {
void CpuTi::modified(bool modified){
CpuTiList *modifiedCpu = static_cast<CpuTiModel*>(getModel())->p_modifiedCpu;
if (modified) {
- if (!is_linked()) {
+ if (!
cpu_ti_hook.
is_linked()) {
modifiedCpu->push_back(*this);
}
} else {
modifiedCpu->push_back(*this);
}
} else {
- if (is_linked()) {
+ if (
cpu_ti_hook.
is_linked()) {
modifiedCpu->erase(modifiedCpu->iterator_to(*this));
}
}
modifiedCpu->erase(modifiedCpu->iterator_to(*this));
}
}
@@
-884,7
+884,7
@@
int CpuTiAction::unref()
if (actionHook::is_linked())
getStateSet()->erase(getStateSet()->iterator_to(*this));
/* remove from action_set */
if (actionHook::is_linked())
getStateSet()->erase(getStateSet()->iterator_to(*this));
/* remove from action_set */
- if (action
TiHook::
is_linked())
+ if (action
_ti_hook.
is_linked())
p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this));
/* remove from heap */
xbt_heap_remove(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, this->m_indexHeap);
p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this));
/* remove from heap */
xbt_heap_remove(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, this->m_indexHeap);