Merge lp:~vorlon/upstart/lp.855010 into lp:upstart

[Steve Langasek]

Unmerged revisions

1358. By Steve Langasek on 2012-02-28

don't treat exec as a sign to stop tracing; in some unusual cases (i.e.,
cups), a process may actually re-exec itself before forking.

=== modified file 'ChangeLog'
--- ChangeLog	2012-02-13 12:08:33 +0000
+++ ChangeLog	2012-02-28 23:37:19 +0000
@@ -1,3 +1,9 @@
[phone]  Steve Langasek  <[e-mail]>
+
+	* init/job_process.c: don't treat exec as a sign to stop tracing; in
+	  some unusual cases (i.e., cups), a process may actually re-exec
+	  itself before forking.
+
 2012-02-13  James Hunt  <[e-mail]>
 
 	* init/log.c:
 
=== modified file 'init/job_process.c'
--- init/job_process.c	2012-02-03 13:17:24 +0000
+++ init/job_process.c	2012-02-28 23:37:19 +0000
@@ -1934,9 +1934,6 @@
  * This function is called whenever a traced @process attached to @job calls
  * the exec() system call after we've set options on it to distinguish them
  * from ordinary SIGTRAPs.
- *
- * We assume that if the job calls exec that it's finished forking so we can
- * drop the trace entirely; we have no interest in tracing the new child.
  **/
 static void
 job_process_trace_exec (Job         *job,
@@ -1954,21 +1951,10 @@
 	nih_info (_("%s %s process (%d) executable changed"),
 		  job_name (job), process_name (process), job->pid[process]);
 
-	if (job->trace_forks) {
-		if (ptrace (PTRACE_DETACH, job->pid[process], NULL, 0) < 0)
-			nih_warn (_("Failed to detach traced "
-				    "%s %s process (%d): %s"),
-				  job_name (job), process_name (process),
-				  job->pid[process], strerror (errno));
-
-		job->trace_state = TRACE_NONE;
-		job_change_state (job, job_next_state (job));
-	} else {
-		if (ptrace (PTRACE_CONT, job->pid[process], NULL, 0) < 0)
-			nih_warn (_("Failed to continue traced %s %s process (%d): %s"),
-				  job_name (job), process_name (process),
-				  job->pid[process], strerror (errno));
-	}
+	if (ptrace (PTRACE_CONT, job->pid[process], NULL, 0) < 0)
+		nih_warn (_("Failed to continue traced %s %s process (%d): %s"),
+			  job_name (job), process_name (process),
+			  job->pid[process], strerror (errno));
 }
 
 
 
=== modified file 'init/tests/test_job_process.c'
--- init/tests/test_job_process.c	2012-02-13 12:08:33 +0000
+++ init/tests/test_job_process.c	2012-02-28 23:37:19 +0000
@@ -8145,11 +8145,11 @@
 		rewind (output);
 
 		TEST_EQ (job->goal, JOB_START);
-		TEST_EQ (job->state, JOB_RUNNING);
+		TEST_EQ (job->state, JOB_SPAWNED);
 		TEST_EQ (job->pid[PROCESS_MAIN], pid);
 
 		TEST_EQ (job->trace_forks, 1);
-		TEST_EQ (job->trace_state, TRACE_NONE);
+		TEST_EQ (job->trace_state, TRACE_NORMAL);
 
 		waitpid (job->pid[PROCESS_MAIN], &status, 0);
 		TEST_TRUE (WIFEXITED (status));