From 964e0949dd35ecc3fd908de7898b01ab37a13bbb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 5 Jun 2010 02:16:20 +0200 Subject: unit: when destructing units make sure we don't readd the unit to the gc queue after we already removed it there --- src/manager.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/manager.c') diff --git a/src/manager.c b/src/manager.c index e37aa83602..38964939c3 100644 --- a/src/manager.c +++ b/src/manager.c @@ -543,13 +543,24 @@ static void manager_clear_jobs_and_units(Manager *m) { assert(m); - manager_dispatch_cleanup_queue(m); - while ((j = hashmap_first(m->transaction_jobs))) job_free(j); while ((u = hashmap_first(m->units))) unit_free(u); + + manager_dispatch_cleanup_queue(m); + + assert(!m->load_queue); + assert(!m->run_queue); + assert(!m->dbus_unit_queue); + assert(!m->dbus_job_queue); + assert(!m->cleanup_queue); + assert(!m->gc_queue); + + assert(hashmap_isempty(m->transaction_jobs)); + assert(hashmap_isempty(m->jobs)); + assert(hashmap_isempty(m->units)); } void manager_free(Manager *m) { -- cgit v1.2.3-54-g00ecf