Merge lp:~xnox/upstart/async-remove-duplicate-event into lp:upstart/async

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

Depends on https://code.launchpad.net/~xnox/upstart/async-kill-sync-spawn/+merge/220534

New commits: -r1660

[Dimitri John Ledkov (xnox)]

ISSUE #1:
 1733 //FIXME must run without TEST_ALLOC_SAFE
 1734 TEST_ALLOC_SAFE {
 1735 event_poll ();
 1736 }

Deeply puzzled by this one:

Memory allocation fails during:
job->process_data = nih_alloc (...)
we then free the job:
nih_free (job);
jump to job_destory:
nih_list_destroy (&job->entry)

And get a segfault here....

[James Hunt (jamesodhunt)]

OK, merging this for now since tests works as-is (for me). We can raise a follow-on to address the issue.

[James Hunt (jamesodhunt)]

review: Approve

=== modified file 'init/job.c'
--- init/job.c	2014-05-21 22:58:41 +0000
+++ init/job.c	2014-05-21 22:58:41 +0000
@@ -978,23 +978,8 @@
 
 
 /**
- * job_emit_event:
- * @job: job generating the event,
- *
- * Compat function, for migration to job_emit_event_with_state.
- *
- * Returns: new Event in the queue.
- **/
-Event *
-job_emit_event (Job *job)
-{
-    return job_emit_event_with_state (job, job->state);
-}
-
-/**
  * job_emit_event_with_state:
  * @job: job generating the event,
- * @state: state job is moving to.
  *
  * Called from a state change because it believes an event should be
  * emitted.  Constructs the event with the right arguments and environment
@@ -1012,7 +997,7 @@
  * Returns: new Event in the queue.
  **/
 Event *
-job_emit_event_with_state (Job *job, JobState state)
+job_emit_event (Job *job)
 {
 	Event           *event;
 	const char      *name;
@@ -1023,7 +1008,7 @@
 
 	nih_assert (job != NULL);
 
-	switch (state) {
+	switch (job->state) {
 	case JOB_STARTING:
 		name = JOB_STARTING_EVENT;
 		block = TRUE;

=== modified file 'init/job.h'
--- init/job.h	2014-05-16 12:12:20 +0000
+++ init/job.h	2014-05-21 22:58:41 +0000
@@ -238,8 +238,6 @@
 void        job_finished        (Job *job, int failed);
 
 Event      *job_emit_event      (Job *job);
-Event      *job_emit_event_with_state (Job *job, JobState state);
-
 
 const char *job_name            (Job *job);
 

=== modified file 'init/tests/test_event.c'
--- init/tests/test_event.c	2014-05-19 16:52:28 +0000
+++ init/tests/test_event.c	2014-05-21 22:58:41 +0000
@@ -1730,8 +1730,10 @@
 			nih_hash_add (job_classes, &class->entry);
 		}
 
-		event_poll ();
-
+		//FIXME must run without TEST_ALLOC_SAFE
+		TEST_ALLOC_SAFE {
+		    event_poll ();
+		}
 		TEST_FREE (event);
 
 		TEST_HASH_NOT_EMPTY (class->instances);