From c9c0cadbf8d8e4c1b99c35a8150c08558f361ebd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 22 Apr 2010 02:41:14 +0200 Subject: [PATCH] manager: fix GC logic --- manager.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/manager.c b/manager.c index f10345b43a9..5cb5c3d2d2f 100644 --- a/manager.c +++ b/manager.c @@ -405,7 +405,7 @@ static void unit_gc_sweep(Unit *u, int gc_marker) { u->meta.gc_marker == -gc_marker) return; - if (!u->meta.in_cleanup_queue) + if (u->meta.in_cleanup_queue) goto bad; if (unit_check_gc(u)) @@ -441,8 +441,10 @@ static unsigned manager_dispatch_gc_queue(Manager *m) { log_debug("Running GC..."); - gc_marker = m->gc_marker; - m->gc_marker = MIN(0, m->gc_marker + 1); + gc_marker = ++m->gc_marker; + + if (m->gc_marker < 0) + m->gc_marker = 1; while ((meta = m->gc_queue)) { assert(meta->in_gc_queue);