X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/242fde5e8077f8193db4df5f262a9672085c8d8a..646748e03f0997e891f569963d0113e16bb63890:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 65bfcca589..00346bf243 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -836,11 +836,11 @@ CpuAction *CpuTi::sleep(double duration) void CpuTi::modified(bool modified){ CpuTiList *modifiedCpu = static_cast(getModel())->p_modifiedCpu; if (modified) { - if (!is_linked()) { + if (!cpu_ti_hook.is_linked()) { modifiedCpu->push_back(*this); } } else { - if (is_linked()) { + if (cpu_ti_hook.is_linked()) { modifiedCpu->erase(modifiedCpu->iterator_to(*this)); } } @@ -881,10 +881,10 @@ int CpuTiAction::unref() { m_refcount--; if (!m_refcount) { - if (actionHook::is_linked()) + if (action_hook.is_linked()) getStateSet()->erase(getStateSet()->iterator_to(*this)); /* remove from action_set */ - if (actionTiHook::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(getModel())->p_tiActionHeap, this->m_indexHeap);