Change the return value of drain. False means the object wasn't able to drain yet.
src/python/m5/config.py: Invert the return value. src/sim/sim_object.cc: Invert the return value of drain. src/sim/sim_object.hh: Change the return value of drain. --HG-- extra : convert_revision : 41bb122c6f29302d8b3815d7bd6a2ea8fba64df9
This commit is contained in:
parent
eceba1405a
commit
8c547d80b1
3 changed files with 3 additions and 3 deletions
|
@ -547,7 +547,7 @@ class SimObject(object):
|
||||||
count = 0
|
count = 0
|
||||||
# ParamContexts don't serialize
|
# ParamContexts don't serialize
|
||||||
if isinstance(self, SimObject) and not isinstance(self, ParamContext):
|
if isinstance(self, SimObject) and not isinstance(self, ParamContext):
|
||||||
if self._ccObject.drain(drain_event):
|
if not self._ccObject.drain(drain_event):
|
||||||
count = 1
|
count = 1
|
||||||
if recursive:
|
if recursive:
|
||||||
for child in self._children.itervalues():
|
for child in self._children.itervalues():
|
||||||
|
|
|
@ -277,7 +277,7 @@ SimObject::drain(Event *drain_event)
|
||||||
"in timing mode!");
|
"in timing mode!");
|
||||||
}
|
}
|
||||||
state = DrainedAtomic;
|
state = DrainedAtomic;
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -116,7 +116,7 @@ class SimObject : public Serializable, protected StartupCallback
|
||||||
|
|
||||||
// Methods to drain objects in order to take checkpoints
|
// Methods to drain objects in order to take checkpoints
|
||||||
// Or switch from timing -> atomic memory model
|
// Or switch from timing -> atomic memory model
|
||||||
// Quiesce returns true if the SimObject cannot quiesce immediately.
|
// Drain returns false if the SimObject cannot drain immediately.
|
||||||
virtual bool drain(Event *drain_event);
|
virtual bool drain(Event *drain_event);
|
||||||
virtual void resume();
|
virtual void resume();
|
||||||
virtual void setMemoryMode(State new_mode);
|
virtual void setMemoryMode(State new_mode);
|
||||||
|
|
Loading…
Reference in a new issue