Merge lp:~vorlon/upstart/stateful-reexec-confsource into lp:~upstart-devel/upstart/stateful-reexec

[Steve Langasek]

(Targeting the new branch)

Simplify the serialization/deserialization code, removing some unnecessary extra copying of jobs / job classes and also avoiding serialization of classes that have no associated instances.

[lp:~vorlon/upstart/stateful-reexec-confsource]

1447. By Steve Langasek on 2012-09-11

Resync with the main branch

1448. By Steve Langasek on 2012-09-11

adjust comments to reflect the code that's changed

=== modified file 'init/event.c'
--- init/event.c	2012-09-10 02:52:58 +0000
+++ init/event.c	2012-09-11 00:41:20 +0000
@@ -629,20 +629,22 @@
  * event_deserialise:
  * @json: JSON-serialised Event object to deserialise.
  *
- * Convert @json into a partial Event object.
+ * Convert @json into an Event object.
  *
  * Note that the object returned is not a true Event since not all
  * structure elements are encoded in the JSON. Of particular note are
  * that event->blocking and event->blockers are handled by
  * state_serialise_resolve_deps().
  *
- * Returns: partial Event object, or NULL on error.
+ * Returns: Event object, or NULL on error.
  **/
 static Event *
 event_deserialise (json_object *json)
 {
 	json_object        *json_env;
-	Event              *partial;
+	Event              *event;
+	nih_local char     *name;
+        char              **env;
 	int                 session_index;
 
 	nih_assert (json);
@@ -650,43 +652,41 @@
 	if (! state_check_json_type (json, object))
 		return NULL;
 
-	partial = nih_new (NULL, Event);
-	if (! partial)
+	if (! state_get_json_string_var (json, "name", NULL, name))
+		goto error;
+
+	if (! state_get_json_var_full (json, "env", array, json_env))
+			goto error;
+
+	env = state_deserialise_str_array (NULL, json_env, TRUE);
+	if (! env)
+		goto error;
+
+	event = event_new (NULL, name, env);
+	if (! event)
 		return NULL;
 
-	memset (partial, '\0', sizeof (Event));
-
-	if (! state_get_json_string_var_to_obj (json, partial, name))
-		goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, fd))
+	if (! state_get_json_int_var_to_obj (json, event, fd))
 		goto error;
 
 	if (! state_get_json_int_var (json, "session", session_index))
 		goto error;
 
 	/* can't check return value here (as all values are legitimate) */
-	partial->session = session_from_index (session_index);
-
-	if (! state_get_json_var_full (json, "env", array, json_env))
-			goto error;
-
-	partial->env = state_deserialise_str_array (partial, json_env, TRUE);
-	if (! partial->env)
-		goto error;
+	event->session = session_from_index (session_index);
 
 	if (! state_get_json_enum_var (json,
 				event_progress_str_to_enum,
-				"progress", partial->progress))
-		goto error;
-
-	if (! state_set_json_int_var_from_obj (json, partial, failed))
-		goto error;
-
-	return partial;
+				"progress", event->progress))
+		goto error;
+
+	if (! state_set_json_int_var_from_obj (json, event, failed))
+		goto error;
+
+	return event;
 
 error:
-	nih_free (partial);
+	nih_free (event);
 	return NULL;
 }
 
@@ -702,7 +702,6 @@
 int
 event_deserialise_all (json_object *json)
 {
-	nih_local Event  *partial = NULL;
 	Event            *event;
 
 	nih_assert (json);
@@ -728,14 +727,9 @@
 		if (! state_check_json_type (json_event, object))
 			goto error;
 
-		partial = event_deserialise (json_event);
-		if (! partial)
+		event = event_deserialise (json_event);
+		if (! event)
 			goto error;
-
-		/* Create a new event */
-		event = NIH_MUST (event_new (NULL, partial->name, partial->env));
-
-		event->session = partial->session;
 	}
 
 	return 0;

=== modified file 'init/job.c'
--- init/job.c	2012-09-10 05:24:47 +0000
+++ init/job.c	2012-09-11 00:41:20 +0000
@@ -63,7 +63,7 @@
 
 /* Prototypes for static functions */
 static json_object *job_serialise (const Job *job);
-static Job *job_deserialise (json_object *json);
+static Job *job_deserialise (JobClass *parent, json_object *json);
 
 static const char *
 job_goal_enum_to_str (JobGoal goal)
@@ -93,7 +93,7 @@
 	__attribute__ ((malloc, warn_unused_result));
 
 static NihTimer *
-job_deserialise_kill_timer (void *parent, json_object *json)
+job_deserialise_kill_timer (json_object *json)
 	__attribute__ ((malloc, warn_unused_result));
 
 /**
@@ -155,6 +155,7 @@
 	job->stop_env = NULL;
 
 	job->stop_on = NULL;
+
 	if (class->stop_on) {
 		job->stop_on = event_operator_copy (job, class->stop_on);
 		if (! job->stop_on)
@@ -1699,7 +1700,7 @@
 	json_logs = json_object_new_array ();
 
 	if (! json_logs)
-		goto error;
+		return json;
 
 	for (int process = 0; process < PROCESS_LAST; process++) {
 		json_object *json_log;
@@ -1731,6 +1732,7 @@
 json_object *
 job_serialise_all (const NihHash *jobs)
 {
+	int          count = 0;
 	json_object *json;
 
 	nih_assert (jobs);
@@ -1743,6 +1745,7 @@
 		json_object  *json_job;
 		Job *job = (Job *)iter;
 
+		count++;
 		json_job = job_serialise (job);
 
 		if (! json_job)
@@ -1751,6 +1754,12 @@
 		json_object_array_add (json, json_job);
 	}
 
+	/* Raise an error to avoid serialising job classes with
+	 * no associated jobs.
+	 */
+	if (!count)
+		goto error;
+
 	return json;
 
 error:
@@ -1760,58 +1769,60 @@
 
 /**
  * job_deserialise:
+ * @parent: job class for JSON-encoded jobs,
  * @json: JSON-serialised Job object to deserialise.
  *
- * Note that the object returned is not a true Job since not all
- * structure elements are encoded in the JSON. Of particular note are
- * that job->blocking is handled by state_serialise_resolve_deps().
- *
  * XXX: All events must have been deserialised prior to this function
  * XXX: being called.
  *
- * Returns: partial Job object, or NULL on error.
+ * Returns: Job object, or NULL on error.
  **/
 static Job *
-job_deserialise (json_object *json)
+job_deserialise (JobClass *parent, json_object *json)
 {
-	Job          *partial;
-	json_object  *kill_timer;
-	json_object  *blocker;
+	nih_local char *name = NULL;
+	Job            *job;
+	json_object    *json_kill_timer;
+	json_object    *blocker;
+	json_object    *json_fds;
+	json_object    *json_pid;
+	json_object    *json_logs;
+	size_t          len;
+	int             ret;
 
 	nih_assert (json);
 
 	if (! state_check_json_type (json, object))
 		return NULL;
 
-	partial = nih_new (NULL, Job);
-	if (! partial)
+	if (! state_get_json_string_var (json, "name", NULL, name))
+		goto error;
+
+	job = NIH_MUST (job_new (parent, name));
+
+	if (! job)
 		return NULL;
 
-	memset (partial, '\0', sizeof (Job));
-
-	if (! state_get_json_string_var_to_obj (json, partial, name))
-		goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, path))
+	if (! state_get_json_string_var_to_obj (json, job, path))
 		goto error;
 
 	if (! state_get_json_enum_var (json,
 				job_goal_str_to_enum,
-				"goal", partial->goal))
+				"goal", job->goal))
 		goto error;
 
 	if (! state_get_json_enum_var (json,
 				job_state_str_to_enum,
-				"state", partial->state))
-		goto error;
-
-	if (! state_get_json_env_array_to_obj (json, partial, env))
-		goto error;
-
-	if (! state_get_json_env_array_to_obj (json, partial, start_env))
-		goto error;
-
-	if (! state_get_json_env_array_to_obj (json, partial, stop_env))
+				"state", job->state))
+		goto error;
+
+	if (! state_get_json_env_array_to_obj (json, job, env))
+		goto error;
+
+	if (! state_get_json_env_array_to_obj (json, job, start_env))
+		goto error;
+
+	if (! state_get_json_env_array_to_obj (json, job, stop_env))
 		goto error;
 
 	if (json_object_object_get (json, "stop_on")) {
@@ -1841,8 +1852,9 @@
 				goto error;
 			}
 
-			partial->stop_on = event_operator_copy (partial, tmp->stop_on);
-			if (! partial->stop_on)
+			nih_free (job->stop_on);
+			job->stop_on = event_operator_copy (job, tmp->stop_on);
+			if (! job->stop_on)
 				goto error;
 		}
 	}
@@ -1859,63 +1871,122 @@
 
 		if (! state_get_json_int_var (json, "blocker", event_index))
 			goto error;
-		partial->blocker = event_from_index (event_index);
+		job->blocker = event_from_index (event_index);
 
-		if (! partial->blocker)
+		if (! job->blocker)
 			goto error;
 	}
 
+	if (! state_get_json_enum_var (json,
+				process_type_str_to_enum,
+				"kill_process", job->kill_process))
+		goto error;
+
 	/* FIXME: kill_timer */
 	nih_info ("XXX: WARNING (%s:%d) job->kill_timer needs testing", __func__, __LINE__);
 	/* Check to see if a kill timer exists first since we do not
 	 * want to end up creating a real but empty timer.
 	 */
-	kill_timer = json_object_object_get (json, "kill_timer");
+	json_kill_timer = json_object_object_get (json, "kill_timer");
 
-	if (kill_timer) {
-		partial->kill_timer = job_deserialise_kill_timer (partial, json);
-		if (! partial->kill_timer)
+	if (json_kill_timer) {
+		/* Found a partial kill timer, so create a new one and
+		 * adjust its due time. By the time the main loop gets
+		 * called, the due time will probably be in the past
+		 * such that the job will be stopped.
+		 *
+		 * To be completely fair we should:
+		 *
+		 * - encode the time at the point of serialisation in a
+		 *   JSON 'meta' header.
+		 * - query the time post-deserialisation and calculate
+		 *   the delta (being the time to perform the stateful
+		 *   re-exec).
+		 * - add that time to all jobs with active kill timers
+		 *   to give their processes the full amount of time to
+		 *   end.
+		 */
+		nih_local NihTimer *kill_timer = job_deserialise_kill_timer (json_kill_timer);
+		if (! kill_timer)
 			goto error;
-	} else {
-		partial->kill_timer = NULL;
+
+		nih_assert (job->kill_process);
+		job_process_set_kill_timer (job, job->kill_process,
+		                            kill_timer->timeout);
+		job_process_adj_kill_timer (job, kill_timer->due);
 	}
 
-	if (! state_get_json_enum_var (json,
-				process_type_str_to_enum,
-				"kill_process", partial->kill_process))
-		goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, failed))
-			goto error;
-
-	if (! state_get_json_enum_var (json,
-				process_type_str_to_enum,
-				"failed_process", partial->failed_process))
-		goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, exit_status))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, respawn_time))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, respawn_count))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, trace_forks))
+	if (! state_get_json_int_var_to_obj (json, job, failed))
+			goto error;
+
+	if (! state_get_json_enum_var (json,
+				process_type_str_to_enum,
+				"failed_process", job->failed_process))
+		goto error;
+
+	if (! state_get_json_int_var_to_obj (json, job, exit_status))
+			goto error;
+
+	if (! state_get_json_int_var_to_obj (json, job, respawn_time))
+			goto error;
+
+	if (! state_get_json_int_var_to_obj (json, job, respawn_count))
+			goto error;
+
+	json_fds = json_object_object_get (json, "fds");
+	if (! json_fds)
+		goto error;
+
+	ret = state_deserialise_int_array (job, json_fds,
+			int, &job->fds, &job->num_fds);
+	if (ret < 0)
+		goto error;
+
+	json_pid = json_object_object_get (json, "pid");
+	if (! json_pid)
+		goto error;
+
+	ret = state_deserialise_int_array (job, json_pid,
+			pid_t, &job->pid, &len);
+	if (ret < 0)
+		goto error;
+
+	if (len != PROCESS_LAST)
+		goto error;
+
+	if (! state_get_json_int_var_to_obj (json, job, trace_forks))
 			goto error;
 
 	if (! state_get_json_enum_var (json,
 				job_trace_state_str_to_enum,
-				"trace_state", partial->trace_state))
-		goto error;
-
-	/* log handled by caller */
-
-	return partial;
+				"trace_state", job->trace_state))
+		goto error;
+
+	json_logs = json_object_object_get (json, "log");
+
+	if (! json_logs)
+		goto error;
+
+	if (! state_check_json_type (json_logs, array))
+		goto error;
+
+	for (int process = 0; process < PROCESS_LAST; process++) {
+		json_object  *json_log;
+
+		json_log = json_object_array_get_idx (json_logs, process);
+		if (! json_log)
+			goto error;
+
+		/* NULL if there was no log configured, or we failed to
+		 * deserialise it; either way, this should be non-fatal.
+		 */
+		job->log[process] = log_deserialise (job->log, json_log);
+	}
+
+	return job;
 
 error:
-	nih_free (partial);
+	nih_free (job);
 	return NULL;
 }
 
@@ -1934,12 +2005,7 @@
 job_deserialise_all (JobClass *parent, json_object *json)
 {
 	json_object  *json_jobs;
-	json_object  *json_fds;
-	json_object  *json_pid;
-	json_object  *json_logs;
 	Job          *job;
-	size_t        len;
-	int           ret;
 
 	nih_assert (parent);
 	nih_assert (json);
@@ -1954,8 +2020,6 @@
 
 	for (int i = 0; i < json_object_array_length (json_jobs); i++) {
 		json_object    *json_job;
-		nih_local Job  *partial = NULL;
-		Log            *partial_log = NULL;
 
 		json_job = json_object_array_get_idx (json_jobs, i);
 		if (! json_job)
@@ -1964,147 +2028,10 @@
 		if (! state_check_json_type (json_job, object))
 			goto error;
 
-		partial = job_deserialise (json_job);
-		if (! partial)
-			goto error;
-
-		job = NIH_MUST (job_new (parent, partial->name));
-
-		state_partial_copy_int (job, partial, goal);
-		state_partial_copy_int (job, partial, state);
-
-		if (! state_copy_str_array_to_obj (job, partial, env))
-			goto error;
-
-		if (! state_copy_str_array_to_obj (job, partial, start_env))
-			goto error;
-		if (! state_copy_str_array_to_obj (job, partial, stop_env))
-			goto error;
-
-		if (! state_copy_event_oper_to_obj (job, partial, stop_on))
-			goto error;
-
-		json_fds = json_object_object_get (json_job, "fds");
-		if (! json_fds)
-			goto error;
-
-		ret = state_deserialise_int_array (job, json_fds,
-				int, &job->fds, &job->num_fds);
-		if (ret < 0)
-			goto error;
-
-		json_pid = json_object_object_get (json_job, "pid");
-		if (! json_pid)
-			goto error;
-
-		ret = state_deserialise_int_array (job, json_pid,
-				pid_t, &job->pid, &len);
-		if (ret < 0)
-			goto error;
-
-		if (len != PROCESS_LAST)
-			goto error;
-
-		state_partial_copy_ptr (job, partial, blocker);
-
-		/* 'blocking' handled by state_deserialise_blocking() */
-
-		state_partial_copy_int (job, partial, kill_process);
-
-		/* Found a partial kill timer, so create a new one and
-		 * adjust its due time. By the time the main loop gets
-		 * called, the due time will probably be in the past
-		 * such that the job will be stopped.
-		 *
-		 * To be completely fair we should:
-		 *
-		 * - encode the time at the point of serialisation in a
-		 *   JSON 'meta' header.
-		 * - query the time post-deserialisation and calculate
-		 *   the delta (being the time to perform the stateful
-		 *   re-exec).
-		 * - add that time to all jobs with active kill timers
-		 *   to give their processes the full amount of time to
-		 *   end.
-		 */
-		if (partial->kill_timer) {
-			nih_assert (job->kill_process);
-			job_process_set_kill_timer (job,
-					job->kill_process,
-					partial->kill_timer->timeout);
-			job_process_adj_kill_timer (job,
-					partial->kill_timer->due);
-		}
-
-		state_partial_copy_int (job, partial, failed);
-		state_partial_copy_int (job, partial, failed_process);
-		state_partial_copy_int (job, partial, exit_status);
-		state_partial_copy_int (job, partial, respawn_time);
-		state_partial_copy_int (job, partial, respawn_count);
-		state_partial_copy_int (job, partial, trace_forks);
-		state_partial_copy_int (job, partial, trace_state);
-
-		/* FIXME: handle ptraced jobs across re-exec */
-		if (partial->trace_state != TRACE_NONE) {
-			nih_info ("XXX: WARNING (%s:%d) tracking of ptraced job instance '%s' (class '%s') will now stop",
-					__func__, __LINE__,
-					job->name ? job->name : "",
-					job->class->name);
-		}
-
-		json_logs = json_object_object_get (json_job, "log");
-
-		if (! json_logs)
-			continue;
-
-		if (! state_check_json_type (json_logs, array))
-			goto error;
-
-		for (int process = 0; process < PROCESS_LAST; process++) {
-			json_object  *json_log;
-			int           io_watch_fd = -1;
-
-			json_log = json_object_array_get_idx (json_logs, process);
-			if (! json_log)
-				goto error;
-
-			partial_log = log_deserialise (json_log);
-			if (! partial_log)
-				goto error;
-
-			if (! *partial_log->path) {
-				/* This log object was simply a
-				 * placeholder so don't apply it.
-				 */
-				nih_free (partial_log);
-				job->log[process] = NULL;
-				continue;
-			}
-
-			if (! state_get_json_int_var (json_log, "io_watch_fd", io_watch_fd))
-				goto error;
-
-			/* re-apply CLOEXEC flag to stop fd being leaked to children */
-			if (io_watch_fd != -1 && state_toggle_cloexec (io_watch_fd, TRUE) < 0)
-				goto error;
-
-			job->log[process] = log_new (job->log, partial_log->path, io_watch_fd, partial_log->uid);
-			if (! job->log[process])
-				goto error;
-
-			state_partial_copy_int (job->log[process], partial_log, fd);
-			state_partial_copy_int (job->log[process], partial_log, detached);
-			state_partial_copy_int (job->log[process], partial_log, remote_closed);
-			state_partial_copy_int (job->log[process], partial_log, open_errno);
-
-			if (partial_log->unflushed->len) {
-				ret = nih_io_buffer_push (job->log[process]->unflushed,
-						partial_log->unflushed->buf,
-						partial_log->unflushed->len);
-				if (ret < 0)
-					goto error;
-			}
-		}
+		job = job_deserialise (parent, json_job);
+		if (! job)
+			goto error;
+
 	}
 
 	return 0;
@@ -2279,7 +2206,6 @@
 /**
  * job_deserialise_kill_timer:
  *
- * @parent: parent for timer.
  * @json: JSON representation of NihTimer.
  *
  * Deserialise @json back into an NihTimer.
@@ -2287,14 +2213,13 @@
  * Returns: NihTimer on NULL on error.
  **/
 static NihTimer *
-job_deserialise_kill_timer (void *parent, json_object *json)
+job_deserialise_kill_timer (json_object *json)
 {
 	NihTimer *timer;
 
-	nih_assert (parent);
 	nih_assert (json);
 
-	timer = nih_new (parent, NihTimer);
+	timer = nih_new (NULL, NihTimer);
 	if (! timer)
 		return NULL;
 

=== modified file 'init/job_class.c'
--- init/job_class.c	2012-09-10 07:43:23 +0000
+++ init/job_class.c	2012-09-11 00:41:20 +0000
@@ -1795,38 +1795,34 @@
 
 		json_class = job_class_serialise (class);
 
+		/* No object returned means the class doesn't need to be
+		 * serialised.  Even if this is a real failure, it's always
+		 * better to serialise as much of the state as possible.
+		 */
 		if (! json_class)
-			goto error;
+			continue;
 
 		json_object_array_add (json, json_class);
 	}
 
 	return json;
-
-error:
-	json_object_put (json);
-	return NULL;
 }
 
 /**
  * job_class_deserialise:
  * @json: JSON-serialised JobClass object to deserialise.
  *
- * Note that the object returned is not a true JobClass since not all
- * structure elements are encoded in the JSON.
- *
- * Further, note that limits, process, instances (jobs), and normalexit
- * are NOT handled by this function - use state_rlimit_deserialise_all(),
- * process_deserialise_all(), job_deserialise_all() and
- * state_deserialise_int_array() respectively.
- *
- * Returns: partial JobClass object, or NULL on error.
+ * Returns: JobClass object, or NULL on error.
  **/
 static JobClass *
 job_class_deserialise (json_object *json)
 {
-	JobClass       *partial;
+	json_object    *json_normalexit;
+	JobClass       *class = NULL;
 	int             session_index;
+	int             ret;
+	nih_local char *name = NULL;
+	nih_local char *path = NULL;
 
 	nih_assert (json);
 	nih_assert (job_classes);
@@ -1834,47 +1830,47 @@
 	if (! state_check_json_type (json, object))
 		goto error;
 
-	partial = nih_new (NULL, JobClass);
-	if (! partial)
-		return NULL;
-
-	memset (partial, '\0', sizeof (JobClass));
-
-	if (! state_get_json_string_var_to_obj (json, partial, name))
-		goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, path))
-		goto error;
-
 	if (! state_get_json_int_var (json, "session", session_index))
-			goto error;
-
-	/* can't check return value here (as all values are legitimate) */
-	partial->session = session_from_index (session_index);
-
-	if (partial->session != NULL) {
+		goto error;
+
+	if (! state_get_json_string_var (json, "name", NULL, name))
+		goto error;
+
+	class = NIH_MUST (job_class_new (NULL, name,
+	                                 session_from_index (session_index)));
+	if (! class)
+		goto error;
+
+	if (class->session != NULL) {
 		nih_warn ("XXX: WARNING (%s:%d): deserialisation of "
 				"user jobs and chroot sessions not currently supported",
 				__func__, __LINE__);
 		goto error;
 	}
 
-	if (! state_get_json_string_var_to_obj (json, partial, instance))
-		goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, description))
-		goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, author))
-		goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, version))
-		goto error;
-
-	if (! state_get_json_env_array_to_obj (json, partial, env))
-		goto error;
-
-	if (! state_get_json_env_array_to_obj (json, partial, export))
+	/* job_class_new() sets path */
+	if (! state_get_json_string_var (json, "path", NULL, path))
+		goto error;
+
+	nih_assert (! strcmp (class->path, path));
+
+	nih_free (class->instance);
+	if (! state_get_json_string_var_to_obj (json, class, instance))
+		goto error;
+
+	if (! state_get_json_string_var_to_obj (json, class, description))
+		goto error;
+
+	if (! state_get_json_string_var_to_obj (json, class, author))
+		goto error;
+
+	if (! state_get_json_string_var_to_obj (json, class, version))
+		goto error;
+
+	if (! state_get_json_env_array_to_obj (json, class, env))
+		goto error;
+
+	if (! state_get_json_env_array_to_obj (json, class, export))
 		goto error;
 
 	/* start and stop conditions are optional */
@@ -1885,8 +1881,8 @@
 			goto error;
 
 		if (*start_on) {
-			partial->start_on = parse_on_simple (partial, "start", start_on);
-			if (! partial->start_on) {
+			class->start_on = parse_on_simple (class, "start", start_on);
+			if (! class->start_on) {
 				NihError *err;
 
 				err = nih_error_get ();
@@ -1910,8 +1906,8 @@
 			goto error;
 
 		if (*stop_on) {
-			partial->stop_on = parse_on_simple (partial, "stop", stop_on);
-			if (! partial->stop_on) {
+			class->stop_on = parse_on_simple (class, "stop", stop_on);
+			if (! class->stop_on) {
 				NihError *err;
 
 				err = nih_error_get ();
@@ -1928,73 +1924,102 @@
 		}
 	}
 
-	if (! state_get_json_str_array_to_obj (json, partial, emits))
+	if (! state_get_json_str_array_to_obj (json, class, emits))
 		goto error;
 
 	/* 'process' must be handled by caller */
 
 	if (! state_get_json_enum_var (json,
 				job_class_expect_type_str_to_enum,
-				"expect", partial->expect))
+				"expect", class->expect))
 		goto error;
 
-	if (! state_get_json_int_var_to_obj (json, partial, task))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, kill_timeout))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, kill_signal))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, respawn))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, respawn_limit))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, respawn_interval))
+	if (! state_get_json_int_var_to_obj (json, class, task))
+			goto error;
+
+	if (! state_get_json_int_var_to_obj (json, class, kill_timeout))
+			goto error;
+
+	if (! state_get_json_int_var_to_obj (json, class, kill_signal))
+			goto error;
+
+	if (! state_get_json_int_var_to_obj (json, class, respawn))
+			goto error;
+
+	if (! state_get_json_int_var_to_obj (json, class, respawn_limit))
+			goto error;
+
+	if (! state_get_json_int_var_to_obj (json, class, respawn_interval))
 			goto error;
 
 	if (! state_get_json_enum_var (json,
 				job_class_console_type_str_to_enum,
-				"console", partial->console))
-		goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, umask))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, nice))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, oom_score_adj))
-			goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, chroot))
-		goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, chdir))
-		goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, setuid))
-			goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, setgid))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, deleted))
-			goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, debug))
-			goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, usage))
-		goto error;
-
-	return partial;
+				"console", class->console))
+		goto error;
+
+	if (! state_get_json_int_var_to_obj (json, class, umask))
+			goto error;
+
+	if (! state_get_json_int_var_to_obj (json, class, nice))
+			goto error;
+
+	if (! state_get_json_int_var_to_obj (json, class, oom_score_adj))
+			goto error;
+
+	if (! state_get_json_string_var_to_obj (json, class, chroot))
+		goto error;
+
+	if (! state_get_json_string_var_to_obj (json, class, chdir))
+		goto error;
+
+	if (! state_get_json_string_var_to_obj (json, class, setuid))
+			goto error;
+
+	if (! state_get_json_string_var_to_obj (json, class, setgid))
+			goto error;
+
+	if (! state_get_json_int_var_to_obj (json, class, deleted))
+			goto error;
+
+	if (! state_get_json_int_var_to_obj (json, class, debug))
+			goto error;
+
+	if (! state_get_json_string_var_to_obj (json, class, usage))
+		goto error;
+
+	json_normalexit = json_object_object_get (json, "normalexit");
+	if (! json_normalexit)
+		goto error;
+
+	ret = state_deserialise_int_array (class, json_normalexit,
+			int, &class->normalexit, &class->normalexit_len);
+	if (ret < 0)
+		goto error;
+
+	if (state_rlimit_deserialise_all (json, class, &class->limits) < 0)
+		goto error;
+
+	if (process_deserialise_all (json, class->process, class->process) < 0)
+		goto error;
+
+	/* Force class to be known.
+	 *
+	 * We cannot use job_class_*consider() since the
+	 * JobClasses have no associated ConfFile.
+	 */
+	job_class_add_safe (class);
+
+	/* Any jobs must be added after the class is registered
+	 * (since you cannot add a job to a partially-created
+	 * class).
+	 */
+	if (job_deserialise_all (class, json) < 0)
+		goto error;
+
+	return class;
 
 error:
-	nih_free (partial);
+	nih_free (class);
 	return NULL;
 }
 
@@ -2010,9 +2035,7 @@
 int
 job_class_deserialise_all (json_object *json)
 {
-	json_object  *json_normalexit;
 	JobClass     *class = NULL;
-	int           ret;
 
 	nih_assert (json);
 
@@ -2028,7 +2051,6 @@
 
 	for (int i = 0; i < json_object_array_length (json_classes); i++) {
 		json_object         *json_class;
-		nih_local JobClass  *partial = NULL;
 
 		json_class = json_object_array_get_idx (json_classes, i);
 		if (! json_class)
@@ -2037,12 +2059,10 @@
 		if (! state_check_json_type (json_class, object))
 			goto error;
 
-		partial = job_class_deserialise (json_class);
-		if (! partial)
+		class = job_class_deserialise (json_class);
+		if (! class)
 			goto error;
 
-		class = NIH_MUST (job_class_new (NULL, partial->name, partial->session));
-
 		/* FIXME:
 		 *
 		 * If user sessions exist (ie 'initctl --session list'
@@ -2053,105 +2073,6 @@
 		 *
 		 */
 
-		/* job_class_new() sets path */
-		nih_assert (! strcmp (class->path, partial->path));
-
-		if (! state_partial_copy_string (class, partial, description))
-			goto error;
-
-		if (! state_partial_copy_string (class, partial, author))
-			goto error;
-
-		if (! state_partial_copy_string (class, partial, version))
-			goto error;
-
-		if (! state_partial_copy_string (class, partial, chroot))
-			goto error;
-
-		if (! state_partial_copy_string (class, partial, chdir))
-			goto error;
-
-		if (! state_partial_copy_string (class, partial, setuid))
-			goto error;
-
-		if (! state_partial_copy_string (class, partial, setgid))
-			goto error;
-
-		if (! state_partial_copy_string (class, partial, usage))
-			goto error;
-
-		state_partial_copy_int (class, partial, expect);
-		state_partial_copy_int (class, partial, task);
-		state_partial_copy_int (class, partial, kill_timeout);
-		state_partial_copy_int (class, partial, kill_signal);
-		state_partial_copy_int (class, partial, respawn);
-		state_partial_copy_int (class, partial, respawn_limit);
-		state_partial_copy_int (class, partial, respawn_interval);
-
-		json_normalexit = json_object_object_get (json_class, "normalexit");
-		if (! json_normalexit)
-			goto error;
-
-		ret = state_deserialise_int_array (class, json_normalexit,
-				int, &class->normalexit, &class->normalexit_len);
-		if (ret < 0)
-			goto error;
-
-		state_partial_copy_int (class, partial, console);
-		state_partial_copy_int (class, partial, umask);
-		state_partial_copy_int (class, partial, nice);
-		state_partial_copy_int (class, partial, oom_score_adj);
-		state_partial_copy_int (class, partial, deleted);
-		state_partial_copy_int (class, partial, debug);
-
-		if (state_rlimit_deserialise_all (json_class, class, &class->limits) < 0)
-			goto error;
-
-		if (! state_copy_str_array_to_obj (class, partial, env))
-			goto error;
-
-		if (! state_copy_str_array_to_obj (class, partial, export))
-			goto error;
-
-		if (! state_copy_str_array_to_obj (class, partial, emits))
-			goto error;
-
-		if (! state_copy_event_oper_to_obj (class, partial, start_on))
-			goto error;
-
-		if (! state_copy_event_oper_to_obj (class, partial, stop_on))
-			goto error;
-
-		if (process_deserialise_all (json_class, class->process, class->process) < 0)
-			goto error;
-
-		/* instance must have a value, but only set it if the
-		 * partial value differs from the default set by
-		 * job_class_new().
-		 */
-		if (partial->instance && *partial->instance) {
-			nih_free (class->instance);
-
-			class->instance = NIH_MUST (nih_strdup (class, partial->instance));
-		}
-
-		/* Force class to be known.
-		 *
-		 * We cannot use job_class_*consider() since the
-		 * JobClasses have no associated ConfFile.
-		 */
-		job_class_add_safe (class);
-
-		/* Any jobs must be added after the class is registered
-		 * (since you cannot add a job to a partially-created
-		 * class).
-		 *
-		 * Associated jobs are handled here rather than in
-		 * job_class_deserialise() to avoid yet more data copying
-		 * from 'partial' to 'class'.
-		 */
-		if (job_deserialise_all (class, json_class) < 0)
-			goto error;
 	}
 
 	return 0;

=== modified file 'init/log.c'
--- init/log.c	2012-09-10 16:00:32 +0000
+++ init/log.c	2012-09-11 00:41:20 +0000
@@ -896,22 +896,23 @@
  * log_deserialise:
  * @json: JSON-serialised Log object to deserialise.
  *
- * Convert @json into a partial Log object.
- *
- * Note that the object returned is not a true Log since not all
- * structure elements are encoded in the JSON.
- *
- * Returns: partial Log object, or NULL on error.
+ * Convert @json into a Log object.
+ *
+ * Returns: Log object, or NULL on error.
  **/
 Log *
-log_deserialise (json_object *json)
+log_deserialise (const void *parent,
+		 json_object *json)
 {
-	Log             *partial;
+	Log             *log;
 	nih_local char  *unflushed_hex = NULL;
 	nih_local char  *unflushed = NULL;
 	int              ret;
 	size_t           len;
 	json_object     *json_unflushed;
+	nih_local char  *path = NULL;
+	int              fd;
+	uid_t            uid;
 
 	nih_assert (json);
 
@@ -920,34 +921,39 @@
 	if (! state_check_json_type (json, object))
 		return NULL;
 
-	partial = nih_new (NULL, Log);
-	if (! partial)
+	if (! state_get_json_string_var (json, "path", NULL, path))
 		return NULL;
 
-	memset (partial, '\0', sizeof (Log));
-
-	if (! state_get_json_string_var_to_obj (json, partial, path))
-		goto error;
-
-	if (! *partial->path) {
+	if (! *path) {
 		/* placeholder log object */
-		return partial;
+		return NULL;
 	}
 
-	if (! state_get_json_int_var_to_obj (json, partial, fd))
+	if (! state_get_json_int_var (json, "io_watch_fd", fd))
+		return NULL;
+
+	/* re-apply CLOEXEC flag to stop fd being leaked to children */
+	if (fd != -1 && state_toggle_cloexec (fd, TRUE) < 0)
+		return NULL;
+
+	if (! state_get_json_int_var (json, "uid", uid))
+		return NULL;
+
+	log = log_new (parent, path, fd, uid);
+	if (! log)
+		return NULL;
+
+	if (! state_get_json_int_var_to_obj (json, log, fd))
 		goto error;
 
 	/* Stop fd leaking to children */
-	if (partial->fd != -1) {
-		if (state_toggle_cloexec (partial->fd, TRUE) < 0)
+	if (log->fd != -1) {
+		if (state_toggle_cloexec (log->fd, TRUE) < 0)
 			goto error;
 	}
 
-	if (! state_get_json_int_var_to_obj (json, partial, uid))
-		goto error;
-
-	partial->unflushed = nih_io_buffer_new (partial);
-	if (! partial->unflushed)
+	log->unflushed = nih_io_buffer_new (log);
+	if (! log->unflushed)
 		goto error;
 
 	json_unflushed = json_object_object_get (json, "unflushed");
@@ -964,22 +970,22 @@
 		if (ret < 0)
 			goto error;
 
-		if (nih_io_buffer_push (partial->unflushed, unflushed, len) < 0)
+		if (nih_io_buffer_push (log->unflushed, unflushed, len) < 0)
 			goto error;
 	}
 
-	if (! state_get_json_int_var_to_obj (json, partial, detached))
-		goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, remote_closed))
-		goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, open_errno))
-		goto error;
-
-	return partial;
+	if (! state_get_json_int_var_to_obj (json, log, detached))
+		goto error;
+
+	if (! state_get_json_int_var_to_obj (json, log, remote_closed))
+		goto error;
+
+	if (! state_get_json_int_var_to_obj (json, log, open_errno))
+		goto error;
+
+	return log;
 
 error:
-	nih_free (partial);
+	nih_free (log);
 	return NULL;
 }

=== modified file 'init/log.h'
--- init/log.h	2012-09-03 16:00:18 +0000
+++ init/log.h	2012-09-11 00:41:20 +0000
@@ -90,7 +90,7 @@
 void  log_unflushed_init     (void);
 json_object * log_serialise (Log *log)
 	__attribute__ ((warn_unused_result, malloc));
-Log * log_deserialise (json_object *json)
+Log * log_deserialise (const void *parent, json_object *json)
 	__attribute__ ((warn_unused_result, malloc));
 
 NIH_END_EXTERN

=== modified file 'init/process.c'
--- init/process.c	2012-08-28 16:29:50 +0000
+++ init/process.c	2012-09-11 00:41:20 +0000
@@ -209,17 +209,9 @@
  *
  * Convert @json into a Process object.
  *
- * Caller must manually nih_ref() returned object to a parent object.
- *
  * Returns: Process object, or NULL on error.
  **/
 
-#if 1
-/* FIXME: should we just make this the same as the other partial
- * objects for consistency?
- */
-#endif
-
 static Process *
 process_deserialise (json_object *json, const void *parent)
 {
@@ -232,14 +224,22 @@
 
 	process = NIH_MUST (process_new (parent));
 
-	memset (process, '\0', sizeof (Process));
-
 	if (! state_get_json_int_var_to_obj (json, process, script))
 			goto error;
 
 	if (! state_get_json_string_var_to_obj (json, process, command))
 		goto error;
 
+	/* All Process slots have to be serialised in the JSON to
+	 * guarantee ordering on deserialisation.
+	 *
+	 * However, here we've found a Process that was merely
+	 * an ordering placeholder - no command has been defined,
+	 * so ignore it.
+	 */
+	if (! process->command || ! *process->command)
+		goto error;
+
 	return process;
 
 error:
@@ -265,7 +265,6 @@
 {
 	json_object        *json_processes;
 	Process            *process;
-	nih_local Process  *partial = NULL;
 	int                 i;
 
 	nih_assert (json);
@@ -292,27 +291,8 @@
 		if (! state_check_json_type (json_process, object))
 			goto error;
 
-		partial = process_deserialise (json_process, partial);
-		if (! partial)
-			goto error;
-
-		/* All Process slots have to be serialised in the JSON to
-		 * guarantee ordering on deserialisation.
-		 *
-		 * However, here we've found a Process that was merely
-		 * an ordering placeholder - no command has been defined,
-		 * so ignore it.
-		 */
-		if (! partial->command || ! *partial->command) {
-			processes[i] = NULL;
-			continue;
-		}
-
-		process = NIH_MUST (process_new (parent));
-		process->command = NIH_MUST (nih_strdup (processes, partial->command));
-		process->script = partial->script;
-
-		processes[i] = process;
+		processes[i] = process_deserialise (json_process, parent);
+
 	}
 
 	return 0;

=== modified file 'init/session.c'
--- init/session.c	2012-09-04 21:51:27 +0000
+++ init/session.c	2012-09-11 00:41:20 +0000
@@ -476,42 +476,47 @@
  * session_deserialise:
  * @json: JSON-serialised Session object to deserialise.
  *
- * Convert @json into a partial Session object.
- *
- * Note that the object returned is not a true Session since not all
- * structure elements are encoded in the JSON.
- *
- * Returns: partial Session object, or NULL on error.
+ * Convert @json into a Session object.
+ *
+ * Returns: Session object, or NULL on error.
  **/
 static Session *
 session_deserialise (json_object *json)
 {
-	Session       *partial;
+	Session              *session;
+	nih_local const char *chroot;
+	uid_t                 user;
 
 	nih_assert (json);
 
 	if (! state_check_json_type (json, object))
 		return NULL;
 
-	partial = nih_new (NULL, Session);
-	if (! partial)
-		return NULL;
-
-	memset (partial, '\0', sizeof (Session));
-
-	if (! state_get_json_string_var_to_obj (json, partial, chroot))
-		goto error;
-
-	if (! state_get_json_int_var_to_obj (json, partial, user))
-			goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, conf_path))
-			goto error;
-
-	return partial;
+	if (! state_get_json_string_var (json, "chroot", NULL, chroot))
+		return NULL;
+
+	if (! state_get_json_int_var (json, "user", user))
+		return NULL;
+
+	/* Create a new session */
+	session = NIH_MUST (session_new (NULL, chroot, user));
+
+	if (! state_get_json_string_var_to_obj (json, session, conf_path))
+		goto error;
+
+	/* Not an error, just the representation of the "NULL session" */
+	if (! *session->chroot && ! session->user && ! *session->conf_path)
+		goto error;
+
+	if (! *session->chroot)
+	{
+		nih_free (session->chroot);
+		session->chroot = NULL;
+	}
+	return session;
 
 error:
-	nih_free (partial);
+	nih_free (session);
 	return NULL;
 }
 
@@ -528,7 +533,6 @@
 session_deserialise_all (json_object *json)
 {
 	Session            *session;
-	nih_local Session  *partial = NULL;
 
 	nih_assert (json);
 
@@ -554,22 +558,14 @@
 		if (! state_check_json_type (json_session, object))
 			goto error;
 
-		partial = session_deserialise (json_session);
-		if (! partial)
-			goto error;
-
-		if (! *partial->chroot && ! partial->user && ! *partial->conf_path) {
-			/* Ignore the "NULL session" which is represented
-			 * by NULL, not an "empty session" internally.
-			 */
+		session = session_deserialise (json_session);
+		/* Ignore the "NULL session" which is represented
+		 * by NULL, not an "empty session" internally.
+		 */
+		if (! session)
 			continue;
-		}
 
-		/* Create a new session and associated ConfSource */
-		session = NIH_MUST (session_new (NULL,
-			*partial->chroot ? partial->chroot : NULL, 
-			partial->user));
-		session->conf_path = NIH_MUST (nih_strdup (session, partial->conf_path));
+		/* Create the associated ConfSource */
 		session_create_conf_source (session, TRUE);
 	}
 

=== modified file 'init/state.h'
--- init/state.h	2012-09-10 10:30:28 +0000
+++ init/state.h	2012-09-11 00:41:20 +0000
@@ -106,23 +106,6 @@
  *   into an array of Process objects which are then hooked onto a
  *   JobClass object).
  *
- * Note that objects returned by <object_>_deserialise() are generally
- * _partial_ objects: they are not true objects since they have not
- * been constructed. They are like templates for the real objects with
- * those elements filled in that the JSON encodes.
- *
- * Each partial object needs to be converted into a real object by:
- *
- * - creating an instance of that object (using <object_>_new()).
- * - copying the element data from the partial object back into the real
- *   object.
- *
- * These steps happens in <object_>_deserialise_all(). It is rather
- * tedious but does ensure that the resultant object is "sane". It
- * is also essential since the JSON representation of most objects does
- * _NOT_ encode all information about an object (for example the JSON
- * encoding for an Event does not encode 'blockers' and 'blocking').
- *
  * == Error Handling ==
  *
  * If stateful re-exec fails, Upstart must perform a stateless reexec: