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

[James Hunt]

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

=== modified file 'ChangeLog'
--- ChangeLog	2013-09-26 16:33:07 +0000
+++ ChangeLog	2013-09-27 16:07:00 +0000
@@ -1,5 +1,10 @@
 2013-09-26  James Hunt  <[e-mail]>
 
+	* init/event.c: event_pending_handle_jobs(): Don't re-iterate job classes
+	  unless quiescing.
+
[phone]  James Hunt  <[e-mail]>
+
 	* 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:07:00 +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 ();
 }