Merge authors: James Hunt (jamesodhunt) Related merge proposals: https://code.launchpad.net/~jamesodhunt/upstart/bypass-quiesce-logic-for-pid1/+merge/188089 proposed by: James Hunt (jamesodhunt) ------------------------------------------------------------ revno: 1535 [merge] committer: Dmitrijs Ledkovs <[email protected]> branch nick: upstart timestamp: Tue 2013-10-01 09:40:40 +0100 message: Merge lp:~jamesodhunt/upstart/bypass-quiesce-logic-for-pid1 modified: ChangeLog init/event.c
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog' --- ChangeLog 2013-09-26 16:33:07 +0000 +++ ChangeLog 2013-09-27 16:02:42 +0000 @@ -1,5 +1,10 @@ 2013-09-26 James Hunt <[email protected]> + * init/event.c: event_pending_handle_jobs(): Don't re-iterate job classes + unless quiescing. + +2013-09-26 James Hunt <[email protected]> + * init/event.c: event_pending_handle_jobs(): Force quiesce when all job instances have finished to speed session shutdown. * init/job_process.c: job_process_jobs_running(): Only consider job === modified file 'init/event.c' --- init/event.c 2013-09-26 16:33:07 +0000 +++ init/event.c 2013-09-27 16:02:42 +0000 @@ -436,6 +436,9 @@ } } + if (! quiesce_in_progress ()) + return; + /* Determine if any job instances remain */ NIH_HASH_FOREACH_SAFE (job_classes, iter) { JobClass *class = (JobClass *)iter; @@ -450,7 +453,7 @@ } /* If no instances remain, force quiesce to finish */ - if (empty && quiesce_in_progress ()) + if (empty) quiesce_complete (); }
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
