55d54
< drainManager(NULL),
121,125c120,121
< // check if we were asked to drain and if we are now done
< if (drainManager && nbrOutstanding() == 0) {
< drainManager->signalDrainDone();
< drainManager = NULL;
< }
---
> if (nbrOutstanding() == 0)
> signalDrainDone();
342,346c338,339
< // check if we were asked to drain and if we are now done
< if (drainManager && nbrOutstanding() == 0) {
< drainManager->signalDrainDone();
< drainManager = NULL;
< }
---
> if (nbrOutstanding() == 0)
> signalDrainDone();
360c353
< DRAMSim2::drain(DrainManager* dm)
---
> DRAMSim2::drain()
364,371c357
< if (nbrOutstanding() != 0) {
< setDrainState(DrainState::Draining);
< drainManager = dm;
< return 1;
< } else {
< setDrainState(DrainState::Drained);
< return 0;
< }
---
> return nbrOutstanding() != 0 ? DrainState::Draining : DrainState::Drained;