Merge lp:~jamesodhunt/upstart/bypass-quiesce-logic-for-pid1 into lp:upstart

Proposed by James Hunt on 2013-09-27
Status: Merged
Merged at revision: 1535
Proposed branch: lp:~jamesodhunt/upstart/bypass-quiesce-logic-for-pid1
Merge into: lp:upstart
Diff against target: 36 lines (+9/-1)
2 files modified
ChangeLog (+5/-0)
init/event.c (+4/-1)
To merge this branch: bzr merge lp:~jamesodhunt/upstart/bypass-quiesce-logic-for-pid1
Reviewer Review Type Date Requested Status
Upstart Reviewers 2013-09-27 Pending
Review via email: mp+188089@code.launchpad.net

Description of the change

* init/event.c: event_pending_handle_jobs(): Don't re-iterate job classes unless quiescing.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-09-26 16:33:07 +0000
3+++ ChangeLog 2013-09-27 16:07:00 +0000
4@@ -1,5 +1,10 @@
5 2013-09-26 James Hunt <james.hunt@ubuntu.com>
6
7+ * init/event.c: event_pending_handle_jobs(): Don't re-iterate job classes
8+ unless quiescing.
9+
10+2013-09-26 James Hunt <james.hunt@ubuntu.com>
11+
12 * init/event.c: event_pending_handle_jobs(): Force quiesce when all job
13 instances have finished to speed session shutdown.
14 * init/job_process.c: job_process_jobs_running(): Only consider job
15
16=== modified file 'init/event.c'
17--- init/event.c 2013-09-26 16:33:07 +0000
18+++ init/event.c 2013-09-27 16:07:00 +0000
19@@ -436,6 +436,9 @@
20 }
21 }
22
23+ if (! quiesce_in_progress ())
24+ return;
25+
26 /* Determine if any job instances remain */
27 NIH_HASH_FOREACH_SAFE (job_classes, iter) {
28 JobClass *class = (JobClass *)iter;
29@@ -450,7 +453,7 @@
30 }
31
32 /* If no instances remain, force quiesce to finish */
33- if (empty && quiesce_in_progress ())
34+ if (empty)
35 quiesce_complete ();
36 }
37

Subscribers

People subscribed via source and target branches