148d147
< BaseSimpleCPU::serialize(os);
149a149
> BaseSimpleCPU::serialize(os);
157d156
< BaseSimpleCPU::unserialize(cp, section);
158a158
> BaseSimpleCPU::unserialize(cp, section);
163c163
< AtomicSimpleCPU::switchOut(Sampler *s)
---
> AtomicSimpleCPU::switchOut()
165,167c165,166
< sampler = s;
< if (status() == Running) {
< _status = SwitchedOut;
---
> assert(status() == Running || status() == Idle);
> _status = SwitchedOut;
169,171c168
< tickEvent.squash();
< }
< sampler->signalSwitched();
---
> tickEvent.squash();