[systemd-commits] src/core

Michal Schmidt michich at kemper.freedesktop.org
Tue Mar 12 16:59:36 PDT 2013


 src/core/manager.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5b176ee064d9737fd933dfeb660d015c19649794
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Mar 12 22:28:44 2013 +0100

    manager: push back animation timer whenever a job finishes
    
    The running jobs animation is supposed to hide itself when jobs are
    progressing sufficiently fast.

diff --git a/src/core/manager.c b/src/core/manager.c
index c261b25..77eaa46 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -148,6 +148,9 @@ static int manager_setup_notify(Manager *m) {
 static int manager_jobs_in_progress_mod_timer(Manager *m) {
         struct itimerspec its;
 
+        if (m->jobs_in_progress_watch.type != WATCH_JOBS_IN_PROGRESS)
+                return 0;
+
         zero(its);
 
         its.it_value.tv_sec = JOBS_IN_PROGRESS_WAIT_SEC;
@@ -2373,8 +2376,10 @@ void manager_check_finished(Manager *m) {
         if (m->n_running_jobs == 0)
                 manager_unwatch_jobs_in_progress(m);
 
-        if (hashmap_size(m->jobs) > 0)
+        if (hashmap_size(m->jobs) > 0) {
+                manager_jobs_in_progress_mod_timer(m);
                 return;
+        }
 
         /* Notify Type=idle units that we are done now */
         close_pipe(m->idle_pipe);



More information about the systemd-commits mailing list