216,219c216,219
< def doQuiesce(root):
< quiesce = cc_main.createCountedQuiesce()
< unready_objects = root.startQuiesce(quiesce, True)
< # If we've got some objects that can't quiesce immediately, then simulate
---
> def doDrain(root):
> drain_event = cc_main.createCountedDrain()
> unready_objects = root.startDrain(drain_event, True)
> # If we've got some objects that can't drain immediately, then simulate
221c221
< quiesce.setCount(unready_objects)
---
> drain_event.setCount(unready_objects)
223c223
< cc_main.cleanupCountedQuiesce(quiesce)
---
> cc_main.cleanupCountedDrain(drain_event)
231c231
< doQuiesce(root)
---
> doDrain(root)
244c244
< doQuiesce(system)
---
> doDrain(system)
253c253
< doQuiesce(system)
---
> doDrain(system)
274,275c274,275
< # Quiesce all of the individual CPUs
< quiesce = cc_main.createCountedQuiesce()
---
> # Drain all of the individual CPUs
> drain_event = cc_main.createCountedDrain()
278,279c278,279
< unready_cpus += old_cpu.startQuiesce(quiesce, False)
< # If we've got some objects that can't quiesce immediately, then simulate
---
> unready_cpus += old_cpu.startDrain(drain_event, False)
> # If we've got some objects that can't drain immediately, then simulate
281c281
< quiesce.setCount(unready_cpus)
---
> drain_event.setCount(unready_cpus)
283c283
< cc_main.cleanupCountedQuiesce(quiesce)
---
> cc_main.cleanupCountedDrain(drain_event)