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

[Steve Langasek]

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

With these changes, I've done a successful stateful reexec for the first time in my test VM - though note that if I try to do so with a full complement of jobs, it fails for me with:

  init:BUG: parse error: Mismatched parentheses

This message seems to come from either the job or job class start/stop rule deserialization. I haven't yet figured out which job is to blame. Looking at the dumped json file, I think it may be from /etc/init/tty4.conf (et al) and mis-serialization of rules with newlines in them.

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

1435. By Steve Langasek on 2012-08-28

Merge latest changes from James' branch

1436. By Steve Langasek on 2012-08-29

Resync with James' branch.

1437. By Steve Langasek on 2012-08-31

Resync with James' branch.

1438. By Steve Langasek on 2012-09-10

Resync with the main branch

1439. By Steve Langasek on 2012-09-10

clean up 'partial' handling for Event deserialization

1440. By Steve Langasek on 2012-09-10

Resync with the main branch

1441. By Steve Langasek on 2012-09-10

clean up 'partial' handling of Log deserialization

1442. By Steve Langasek on 2012-09-10

Resync with the main branch

1443. By Steve Langasek on 2012-09-10

clean up 'partial' handling of Process deserialization

1444. By Steve Langasek on 2012-09-10

clean up 'partial' handling of Session deserialization

1445. By Steve Langasek on 2012-09-10

Finally, drop the comments in state.h about the right way to deserialize
involving returning partial objects; there's just no need for allocating
twice and copying contents around when we can just make sure we always
deserialize the bits needed for the object constructor first, then populate
everything in one go.

1446. By Steve Langasek on 2012-09-10

Resync with the main branch

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 'ChangeLog'
--- ChangeLog	2012-05-23 13:27:13 +0000
+++ ChangeLog	2012-09-11 00:41:22 +0000
@@ -1,3 +1,7 @@
[phone]  James Hunt  <[e-mail]>
+
+	* Merged lp:~jconti/upstart/fix_empty_chroot.
+
 2012-05-23  James Hunt  <[e-mail]>
 
 	* init/main.c: Add in "bare" re-exec handling from Ubuntu

=== modified file 'dbus/com.ubuntu.Upstart.xml'
--- dbus/com.ubuntu.Upstart.xml	2012-08-10 14:06:25 +0000
+++ dbus/com.ubuntu.Upstart.xml	2012-09-11 00:41:22 +0000
@@ -42,14 +42,6 @@
       <arg name="job" type="o" />
     </signal>
 
-    <method name="DebugSerialise">
-      <arg name="json" type="s" direction="out" />
-    </method>
-
-    <method name="DebugDeserialise">
-      <arg name="json" type="s" direction="in" />
-    </method>
-
     <!-- Event emission -->
     <method name="EmitEvent">
       <annotation name="com.netsplit.Nih.Method.Async" value="true" />

=== modified file 'init/Makefile.am'
--- init/Makefile.am	2012-08-24 16:42:22 +0000
+++ init/Makefile.am	2012-09-11 00:41:22 +0000
@@ -42,7 +42,7 @@
 	environ.c environ.h \
 	process.c process.h \
 	session.c session.h \
-        state.c state.h \
+	state.c state.h \
 	job_class.c job_class.h \
 	job_process.c job_process.h \
 	job.c job.h \

=== modified file 'init/conf.c'
--- init/conf.c	2012-08-24 16:28:07 +0000
+++ init/conf.c	2012-09-11 00:41:22 +0000
@@ -94,13 +94,6 @@
 
 
 /**
- * deserialised:
- *
- * TRUE if configuration is being parsed after deserialisation.
- **/
-static int deserialised = FALSE;
-
-/**
  * is_conf_file_std:
  * @path: path to check.
  *
@@ -336,9 +329,6 @@
 /**
  * conf_reload:
  *
- * @_deserialised: TRUE if called _immediately_ after deserialisation,
- * else FALSE.
- *
  * Reloads all configuration sources.
  *
  * Watches on new configuration sources are established so that future
@@ -350,16 +340,10 @@
  * parse no configuration without error.
  **/
 void
-conf_reload (int _deserialised)
+conf_reload (void)
 {
 	conf_init ();
 
-	/* Indicate that existing JobClasses are to be used, rather than
-	 * reparsing configuration files.
-	 */
-	if (_deserialised)
-		deserialised = TRUE;
-
 	NIH_LIST_FOREACH (conf_sources, iter) {
 		ConfSource *source = (ConfSource *)iter;
 
@@ -374,14 +358,6 @@
 			nih_free (err);
 		}
 	}
-
-	/* Now the ConfFiles are associated with the deserialised
-	 * JobClasses, we can forget about deserialisation such that all
-	 * future file changes will recreate the JobClasses if
-	 * necessary.
-	 */
-	if (_deserialised)
-		deserialised = FALSE;
 }
 
 /**
@@ -958,7 +934,7 @@
  * @path: path of conf file to be reloaded.
  * @override_path: if not NULL and @path refers to a path associated with @source,
  * overlay the contents of @path into the existing @source entry for
- * @path. If FALSE, discard any existing knowledge of @path,
+ * @path. If FALSE, discard any existing knowledge of @path.
  *
  * This function is used to parse the file at @path (or @override_path) in the
  * context of the given configuration @source.  Necessary ConfFile structures
@@ -986,7 +962,6 @@
 	size_t          len, pos, lineno;
 	NihError       *err = NULL;
 	const char     *path_to_load;
-	JobClass       *existing;
 
 	nih_assert (source != NULL);
 	nih_assert (path != NULL);
@@ -1067,29 +1042,13 @@
 			nih_debug ("Loading %s from %s", name, path);
 		}
 
-		if (deserialised) {
-			job_class_init ();
-
-			existing = job_class_get (name, source->session);
-
-			/* Found an existing job class created via the
-			 * deserialisation process, so use that rather
-			 * than reparsing the file.
-			 */
-			if (existing) {
-				file->job = existing;
-				nih_debug ("Using existing deserialised JobClass for %s", name);
-			}
-
+		file->job = parse_job (NULL, source->session, file->job,
+				name, buf, len, &pos, &lineno);
+
+		if (file->job) {
+			job_class_consider (file->job);
 		} else {
-			file->job = parse_job (NULL, source->session, file->job,
-					name, buf, len, &pos, &lineno);
-
-			if (file->job) {
-				job_class_consider (file->job);
-			} else {
-				err = nih_error_get ();
-			}
+			err = nih_error_get ();
 		}
 
 		break;
@@ -1227,7 +1186,7 @@
 	return NULL;
 }
 
-//#ifdef DEBUG
+#ifdef DEBUG
 
 size_t
 debug_count_list_entries (const NihList *list)
@@ -1428,5 +1387,5 @@
 	}
 }
 
-//#endif /* DEBUG */
+#endif /* DEBUG */
 

=== modified file 'init/conf.h'
--- init/conf.h	2012-08-23 17:01:48 +0000
+++ init/conf.h	2012-09-11 00:41:22 +0000
@@ -119,7 +119,7 @@
 ConfFile *  conf_file_new      (ConfSource *source, const char *path)
 	__attribute__ ((warn_unused_result, malloc));
 
-void        conf_reload        (int _deserialised);
+void        conf_reload        (void);
 int         conf_source_reload (ConfSource *source)
 	__attribute__ ((warn_unused_result));
 
@@ -130,7 +130,7 @@
 char *toggle_conf_name         (const void *parent, const char *path)
 	__attribute__ ((warn_unused_result, malloc));
 
-//#ifdef DEBUG
+#ifdef DEBUG
 
 /* used for debugging only */
 #include "job.h"
@@ -173,7 +173,7 @@
 debug_show_conf_sources(void)
 	__attribute__ ((unused));
 
-//#endif
+#endif
 
 NIH_END_EXTERN
 

=== modified file 'init/control.c'
--- init/control.c	2012-08-24 16:24:40 +0000
+++ init/control.c	2012-09-11 00:41:22 +0000
@@ -63,26 +63,7 @@
 static void  control_disconnected   (DBusConnection *conn);
 static void  control_register_all   (DBusConnection *conn);
 
-/* FIXME: temporary function attribute */
-#if 1
-static void  control_clear_cloexec  (void)
-	__attribute__ ((unused));
-#endif
-
 static void  control_bus_flush      (void);
-static int   control_get_connection_fd (DBusConnection *connection)
-	__attribute__ ((warn_unused_result));
-static json_object * control_serialise (DBusConnection *connection)
-	__attribute__ ((malloc, warn_unused_result));
-static DBusConnection *control_deserialise (json_object *json)
-#if 0
-	__attribute__ ((malloc, warn_unused_result));
-#else
-/* FIXME: temporary function attribute */
-	__attribute__ ((unused));
-#endif
-
-extern json_object *json_control_conns;;
 
 /**
  * use_session_bus:
@@ -222,8 +203,6 @@
 /**
  * control_bus_open:
  *
- * @restart: specify TRUE on restart, else FALSE.
- *
  * Open a connection to the appropriate D-Bus bus and store it in the
  * control_bus global. The connection is handled automatically
  * in the main loop.
@@ -231,45 +210,26 @@
  * Returns: zero on success, negative value on raised error.
  **/
 int
-control_bus_open (int restart)
+control_bus_open (void)
 {
 	DBusConnection *conn;
 	DBusError       error;
 	NihListEntry   *entry;
 	int             ret;
 
-#if 0
-	if (restart) {
-		conn = control_bus;
-		if (! conn) {
-			nih_error_raise (CONTROL_REEXEC_ERROR,
-					_(CONTROL_REEXEC_ERROR_STR));
-			return -1;
-		}
-		dbus_connection_set_exit_on_disconnect (conn, FALSE);
-
-		if (nih_dbus_setup (conn, control_disconnected) < 0) {
-			dbus_connection_unref (conn);
-			nih_return_no_memory_error (-1);
-		}
-	} else {
-#endif
-		nih_assert (control_bus == NULL);
-
-		control_init ();
-
-		control_handle_bus_type ();
-
-		/* Connect to the D-Bus System Bus and hook everything up into
-		 * our own main loop automatically.
-		 */
-		conn = nih_dbus_bus (use_session_bus ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM,
-				control_disconnected);
-		if (! conn)
-			return -1;
-#if 0
-	}
-#endif
+	nih_assert (control_bus == NULL);
+
+	control_init ();
+
+	control_handle_bus_type ();
+
+	/* Connect to the D-Bus System Bus and hook everything up into
+	 * our own main loop automatically.
+	 */
+	conn = nih_dbus_bus (use_session_bus ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM,
+			     control_disconnected);
+	if (! conn)
+		return -1;
 
 	/* Register objects on the bus. */
 	control_register_all (conn);
@@ -298,20 +258,15 @@
 	}
 
 
-#if 0
-	if (! restart) {
-#endif
-		/* Add the connection to the list */
-		entry = NIH_MUST (nih_list_entry_new (NULL));
-
-		entry->data = conn;
-
-		nih_list_add (control_conns, &entry->entry);
-
-		control_bus = conn;
-#if 0
-	}
-#endif
+	/* Add the connection to the list */
+	entry = NIH_MUST (nih_list_entry_new (NULL));
+
+	entry->data = conn;
+
+	nih_list_add (control_conns, &entry->entry);
+
+
+	control_bus = conn;
 
 	return 0;
 }
@@ -355,15 +310,6 @@
 
 		nih_warn (_("Disconnected from system bus"));
 
-#if 0
-		if (dbus_bus_release_name (conn, DBUS_SERVICE_UPSTART, &error) < 0) {
-			nih_error ("Unable to release D-Bus name '%s'", DBUS_SERVICE_UPSTART);
-			dbus_error_free (&error);
-			return;
-		}
-		control_bus_flush ();
-#endif
-
 		control_bus = NULL;
 	}
 
@@ -431,7 +377,7 @@
 	nih_info (_("Reloading configuration"));
 
 	/* This can only be called after deserialisation */
-	conf_reload (FALSE);
+	conf_reload ();
 
 	return 0;
 }
@@ -871,60 +817,6 @@
 }
 
 /**
- * control_get_connection_fd:
- *
- * @connection: DBusConnection.
- *
- * Obtain the file descriptor associated with the specified connection.
- *
- * Returns: file descriptor, or -1 on error.
- **/
-int
-control_get_connection_fd (DBusConnection *connection)
-{
-	int fd;
-
-	nih_assert (connection);
-
-	if (! dbus_connection_get_unix_fd (connection, &fd))
-		return -1;
-
-	return fd;
-}
-
-/**
- * control_clear_cloexec:
- *
- * Clear the close-on-exec flag for the D-Bus control bus.
- *
- * Required to ensure D-Bus connections are maintained across a re-exec
- * since the default is for D-Bus to mark all fds close-on-exec.
- **/
-static void
-control_clear_cloexec (void)
-{
-	control_init ();
-
-	nih_assert (control_bus);
-
-	NIH_LIST_FOREACH (control_conns, iter) {
-		NihListEntry    *entry = (NihListEntry *)iter;
-		DBusConnection  *conn = entry->data;
-		int              fd;
-
-		fd = control_get_connection_fd (conn);
-
-		if (state_toggle_cloexec (fd, FALSE) < 0)
-			nih_warn (_("Failed to clear control connection CLOEXEC flag"));
-#if 1
-		/* FIXME */
-		nih_message ("XXX: found D-Bus connection %p (fd=%d, control bus=%s)",
-				conn, fd, conn == control_bus ? "yes" : "no");
-#endif
-	}
-}
-
-/**
  * control_bus_flush:
  *
  * Drain any remaining messages in the D-Bus queue.
@@ -960,281 +852,8 @@
 
 	control_bus_flush ();
 
-#if 1
-	/* FIXME */
-	nih_warn ("XXX: WARNING (%s:%d): NOT clearing close-on-exec bit for D-Bus connections yet",
-			__func__, __LINE__);
-#else
-	control_clear_cloexec ();
-#endif
-}
-
-
-/**
- * control_serialise:
- *
- * @connection: DBusConnection.
- *
- * Convert DBusConnection to JSON representation.
- *
- * Returns: JSON object encoding @connection, or NULL on error.
- */
-static json_object *
-control_serialise (DBusConnection *connection)
-{
-	json_object  *json;
-	int           fd;
-	//const char   *address;
-
-	nih_assert (connection);
-	nih_assert (control_bus);
-
-	control_init ();
-
-	control_handle_bus_type ();
-
-	json = json_object_new_object ();
-	if (! json)
-		return NULL;
-
-	fd = control_get_connection_fd (connection);
-	if (fd < 0)
-		goto error;
-
-	if (! state_set_json_int_var (json, "fd", fd))
-		goto error;
-
-	/* FIXME */
-#if 0
-	address = dbus_connection_get_address (connection);
-	if (! address)
-		goto error;
-
-	if (! state_set_json_string_var (json, "address", address))
-		goto error;
-#else
-	nih_warn ("XXX: WARNING (%s:%d): NOT serialising D-Bus connection address yet",
-			__func__, __LINE__);
-#endif
-
-	if (connection == control_bus)
-		if (! state_set_json_int_var (json, "control_bus", 1))
-			goto error;
-
-	return json;
-
-error:
-	json_object_put (json);
-	return NULL;
-
-}
-
-
-/**
- * control_serialise_all:
- *
- * Convert existing control connections to JSON representation.
- *
- * This is achieved minimally by:
- *
- * - identifying all file descriptors relating to control connections.
- * - clearing the close-on-exec flag on each file descriptor.
- * - storing all file descriptor values in the JSON.
- *
- * Returns: JSON object containing array of control connection details,
- * or NULL on error.
- **/
-json_object *
-control_serialise_all (void)
-{
-	json_object  *json;
-
-	control_init ();
-
-	json = json_object_new_array ();
-	if (! json)
-		return NULL;
-
-	NIH_LIST_FOREACH (control_conns, iter) {
-		NihListEntry    *entry = (NihListEntry *)iter;
-		DBusConnection  *conn = entry->data;
-		json_object     *json_conn;
-#if 0
-		int              fd;
-
-		fd = control_get_connection_fd (conn);
-
-		if (state_toggle_cloexec (fd, FALSE) < 0) {
-			nih_error (_("Failed to clear control connection CLOEXEC flag"));
-			goto error;
-		}
-#else
-	/* FIXME */
-	nih_warn ("XXX: WARNING (%s:%d): NOT clearing close-on-exec bit for D-Bus connections yet",
-			__func__, __LINE__);
-#endif
-
-		json_conn = control_serialise (conn);
-
-		if (! json_conn)
-			goto error;
-
-		json_object_array_add (json, json_conn);
-	}
-
-	return json;
-
-error:
-	json_object_put (json);
-	return NULL;
-}
-
-/**
- * control_deserialise:
- * @json: JSON-serialised DBusConnection object to deserialise.
- *
- * Convert @json into a DBusConnection object.
- *
- * Returns: DBusConnection object, or NULL on error.
- **/
-static DBusConnection *
-control_deserialise (json_object *json)
-{
-	DBusConnection        *conn = NULL;
-	DBusError              error;
-	int                    fd;
-	nih_local char  *address = NULL;
-	NihListEntry    *entry;
-
-	nih_assert (json);
-
-	if (! state_check_json_type (json, object))
-		return NULL;
-
-	if (! state_get_json_int_var (json, "fd", fd))
-		goto error;
-
-	if (! state_fd_valid (fd))
-		goto error;
-
-	if (! state_get_json_string_var (json, "address", NULL, address))
-		goto error;
-
-	dbus_error_init (&error);
-
-	/* FIXME: this isn't currently possible as
-	 * dbus_connection_open_from_fd() has not been added to D-Bus.
-	 *
-	 * References:
-	 *
-	 * See: lp:~jamesodhunt/dbus/create-connection-from-fd
-	 */
-
-	/* (Re)create the D-Bus connections from the file descriptors
-	 * passed from the original PID 1.
-	 */
-
-/* FIXME */
-#if 0
-	nih_warn ("XXX: WARNING(%s:%d): using unofficial D-Bus API dbus_connection_open_from_fd()",
-			__func__, __LINE__);
-
-	conn = dbus_connection_open_from_fd (address, fd, &error);
-	if (! conn || dbus_error_is_set (&error)) {
-		nih_error ("%s: %s",
-				_("failed to recreate D-Bus connection from fd"),
-				error.message);
-		dbus_error_free (&error);
-		goto error;
-	}
-#else
-	nih_warn ("XXX: WARNING (%s:%d): unable to maintain D-Bus connections "
-			"- bridges must be restarted",
-			__func__, __LINE__);
-
-	/* FIXME: keep compiler happy */
-	conn = NULL;
-#endif
-
-	/* Re-apply close-on-exec flag to stop fd from leaking
-	 * to child processes.
-	 */
-	if (state_toggle_cloexec (fd, 1) < 0)
-		goto error;
-
-	/* Add the connection to the list */
-	entry = NIH_MUST (nih_list_entry_new (NULL));
-
-	entry->data = conn;
-
-	nih_list_add (control_conns, &entry->entry);
-
-	if (json_object_object_get_ex (json, "control_bus", NULL))
-		control_bus = conn;
-
-	return conn;
-
-error:
-	dbus_free (conn);
-	return NULL;
-}
-
-/**
- * control_deserialise_all:
- *
- * @json: root of JSON-serialised state.
- *
- * Convert JSON representation of control connections back into
- * DBusConnection objects.
- *
- * Returns: 0 on success, -1 on error.
- **/
-int
-control_deserialise_all (json_object *json)
-{
-	nih_assert (json);
-
-	control_init ();
-
-	nih_assert (! control_bus);
-	nih_assert (NIH_LIST_EMPTY (control_conns));
-
-	json_control_conns = json_object_object_get (json, "control_conns");
-
-	if (! json_control_conns)
-		goto error;
-
-	if (! state_check_json_type (json_control_conns, array))
-		goto error;
-
-	for (int i = 0; i < json_object_array_length (json_control_conns); i++) {
-		json_object   *json_control_conn;
-
-		json_control_conn = json_object_array_get_idx (json_control_conns, i);
-		if (! json_control_conn)
-			goto error;
-
-		/* FIXME */
-#if 0
-		if (! control_deserialise (json_control_conn))
-			goto error;
-#else
-		nih_warn ("XXX: WARNING (%s:%d): D-Bus connections NOT being deserialised yet",
-				__func__, __LINE__);
-#endif
-	}
-
-#if 0
-	if (! control_bus)
-		goto error;
-#endif
-
-	return 0;
-
-error:
-	return -1;
-
-}
+}
+
 
 /**
  * control_conn_to_index:
@@ -1314,7 +933,8 @@
 	DBusError  error;
 	int        ret;
 
-	nih_assert (control_bus);
+	if (! control_bus)
+		return 0;
 
 	dbus_error_init (&error);
 	ret = dbus_bus_release_name (control_bus,
@@ -1328,77 +948,3 @@
 
 	return 0;
 }
-
-
-/* FIXME: TEST/DEBUG only */
-#if 1
-/**
- * control_debug_serialise:
- *
- * @data: not used,
- * @message: D-Bus connection and message received,
- * @json: output string returned to client.
- *
- * Convert internal state to JSON string.
- *
- * Returns: zero on success, negative value on raised error.
- **/
-int
-control_debug_serialise (void           *data,
-			NihDBusMessage  *message,
-			char           **json)
-{
-	size_t len;
-
-	nih_assert (message != NULL);
-	nih_assert (json != NULL);
-
-	control_prepare_reexec ();
-
-	if (state_to_string (json, &len) < 0)
-		goto error;
-
-	nih_ref (*json, message);
-
-	return 0;
-
-error:
-	nih_dbus_error_raise_printf (DBUS_ERROR_NO_MEMORY,
-			_("Out of Memory"));
-	return -1;
-}
-
-/**
- * control_debug_deserialise:
- *
- * @data: not used,
- * @message: D-Bus connection and message received,
- * @json: JSON string to be deserialised.
- *
- * Convert JSON string to internal state.
- *
- * Returns: zero on success, negative value on raised error.
- **/
-int
-control_debug_deserialise (void *data,
-		NihDBusMessage  *message,
-		char            *json)
-{
-	int    ret;
-	nih_assert (message != NULL);
-	nih_assert (json != NULL);
-
-	ret = state_from_string (json);
-
-	if (ret < 0)
-		goto error;
-
-	return 0;
-
-error:
-	nih_dbus_error_raise_printf (DBUS_ERROR_NO_MEMORY,
-			_("Out of Memory"));
-	return -1;
-}
-
-#endif

=== modified file 'init/control.h'
--- init/control.h	2012-08-24 17:38:22 +0000
+++ init/control.h	2012-09-11 00:41:22 +0000
@@ -56,7 +56,7 @@
 	__attribute__ ((warn_unused_result));
 void control_server_close         (void);
 
-int  control_bus_open             (int restart)
+int  control_bus_open             (void)
 	__attribute__ ((warn_unused_result));
 void control_bus_close            (void);
 
@@ -94,12 +94,6 @@
 
 void control_prepare_reexec       (void);
 
-json_object * control_serialise_all (void)
-	__attribute__ ((malloc, warn_unused_result));
-
-int control_deserialise_all (json_object *json)
-	__attribute__ ((warn_unused_result));
-
 int control_conn_to_index (const DBusConnection *connection)
 	__attribute__ ((warn_unused_result));
 
@@ -110,21 +104,6 @@
 int control_bus_release_name (void)
 	__attribute__ ((warn_unused_result));
 
-/* FIXME: DEBUG/TEST only */
-#if 1
-int
-control_debug_serialise (void   *data,
-		NihDBusMessage  *message,
-		char           **json)
-	__attribute__ ((warn_unused_result));
-
-int
-control_debug_deserialise (void *data,
-		NihDBusMessage  *message,
-		char           *json)
-	__attribute__ ((warn_unused_result));
-#endif
-
 NIH_END_EXTERN
 
 #endif /* INIT_CONTROL_H */

=== modified file 'init/errors.h'
--- init/errors.h	2012-08-23 17:01:48 +0000
+++ init/errors.h	2012-09-11 00:41:22 +0000
@@ -54,7 +54,6 @@
 
 	/* Errors while handling control requests */
 	CONTROL_NAME_TAKEN,
-	CONTROL_REEXEC_ERROR,
 };
 
 /* Error strings for defined messages */
@@ -77,6 +76,5 @@
 #define PARSE_EXPECTED_VARIABLE_STR	N_("Expected variable name before value")
 #define PARSE_MISMATCHED_PARENS_STR	N_("Mismatched parentheses")
 #define CONTROL_NAME_TAKEN_STR		N_("Name already taken")
-#define CONTROL_REEXEC_ERROR_STR	N_("No existing control bus")
 
 #endif /* INIT_ERRORS_H */

=== modified file 'init/event.c'
--- init/event.c	2012-08-17 16:05:54 +0000
+++ init/event.c	2012-09-11 00:41:22 +0000
@@ -46,6 +46,7 @@
 
 #include "com.ubuntu.Upstart.h"
 
+
 /* Prototypes for static functions */
 static void event_pending              (Event *event);
 static void event_pending_handle_jobs  (Event *event);
@@ -539,8 +540,6 @@
 	nih_assert (event);
 	nih_assert (event->name);
 
-	event_init ();
-
 	json = json_object_new_object ();
 	if (! json)
 		return NULL;
@@ -572,9 +571,6 @@
 	if (! state_set_json_int_var_from_obj (json, event, blockers))
 		goto error;
 
-	/* FIXME: should we remove the if test and always encode
-	 * something in the JSON here?
-	 */
 	if (! NIH_LIST_EMPTY (&event->blocking)) {
 		json_object *json_blocking;
 
@@ -633,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);
@@ -654,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;
 }
 
@@ -706,19 +702,13 @@
 int
 event_deserialise_all (json_object *json)
 {
-	nih_local Event  *partial = NULL;
 	Event            *event;
 
 	nih_assert (json);
 
 	event_init ();
 
-	/* FIXME: enable for final build */
-#if PRODUCTION_BUILD
 	nih_assert (NIH_LIST_EMPTY (events));
-#else
-	nih_warn ("XXX: WARNING (%s:%d): NIH_LIST_EMPTY(events) check disabled", __func__, __LINE__);
-#endif
 	json_events = json_object_object_get (json, "events");
 
 	if (! json_events)
@@ -737,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;
@@ -809,7 +794,7 @@
 	int found = FALSE;
 
 	nih_assert (event);
-	nih_assert (events);
+	event_init ();
 
 	NIH_LIST_FOREACH (events, iter) {
 		Event *tmp = (Event *)iter;
@@ -843,7 +828,7 @@
 	int i = 0;
 
 	nih_assert (event_index >= 0);
-	nih_assert (events);
+	event_init ();
 
 	NIH_LIST_FOREACH (events, iter) {
 		Event *event = (Event *)iter;

=== modified file 'init/event_operator.c'
--- init/event_operator.c	2012-08-31 14:42:40 +0000
+++ init/event_operator.c	2012-09-11 00:41:22 +0000
@@ -725,7 +725,7 @@
 event_operator_collapse (EventOperator *condition)
 {
 	nih_local NihList       *stack = NULL;
-	nih_local NihListEntry  *latest = NULL;
+	NihListEntry            *latest = NULL;
 	NihTree                 *root;
 
 	nih_assert (condition);

=== modified file 'init/job.c'
--- init/job.c	2012-08-28 16:29:50 +0000
+++ init/job.c	2012-09-11 00:41:22 +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)
@@ -1553,11 +1554,6 @@
 
 	nih_assert (job);
 
-	/* FIXME:
-	 *
-	 * log !!!
-	 */
-
 	json = json_object_new_object ();
 	if (! json)
 		return NULL;
@@ -1587,15 +1583,15 @@
 	if (! state_set_json_str_array_from_obj (json, job, stop_env))
 		goto error;
 
-	stop_on = job->stop_on
-		? event_operator_collapse (job->stop_on)
-		: NIH_MUST (nih_strdup (NULL, ""));
-
-	if (! stop_on)
-		goto error;
-
-	if (! state_set_json_string_var (json, "stop_on", stop_on))
-		goto error;
+	if (job->stop_on)
+	{
+		stop_on = event_operator_collapse (job->stop_on);
+		if (! stop_on)
+			goto error;
+
+		if (! state_set_json_string_var (json, "stop_on", stop_on))
+			goto error;
+	}
 
 	json_fds = state_serialise_int_array (int, job->fds, job->num_fds);
 	if (! json_fds)
@@ -1611,11 +1607,8 @@
 	json_object_object_add (json, "pid", json_pid);
 
 	/* Encode the blocking event as an index number which represents
-	 * the events position in the JSON events array.
+	 * the event's position in the JSON events array.
 	 */
-#if 1
-	/* FIXME: we're only encoding if there *IS* a blocker!?! */
-#endif
 	if (job->blocker) {
 		int event_index;
 
@@ -1633,9 +1626,6 @@
 
 	}
 
-	/* FIXME: should we remove the if test and always encode
-	 * something in the JSON here?
-	 */
 	if (! NIH_LIST_EMPTY (&job->blocking)) {
 		json_object *json_blocking;
 
@@ -1646,11 +1636,6 @@
 		json_object_object_add (json, "blocking", json_blocking);
 	}
 
-	/* FIXME */
-#if 1
-	nih_info ("XXX:%s:%d:warning job->kill_timer NEEDS TESTING", __func__, __LINE__);
-#endif
-
 	/* conditionally encode kill timer */
 	if (job->kill_timer) {
 		json_object *kill_timer;
@@ -1689,7 +1674,6 @@
 		goto error;
 
 	/* FIXME: handle ptraced jobs across re-exec */
-#if 1	
 	if (job->trace_state != TRACE_NONE) {
 		nih_info ("XXX: WARNING (%s:%d) tracking of ptraced job instance '%s' (class '%s') will stop after re-exec",
 				__func__, __LINE__,
@@ -1707,7 +1691,6 @@
 					i, job->pid[i]);
 		}
 	}
-#endif
 
 	if (! state_set_json_enum_var (json,
 				job_trace_state_enum_to_str,
@@ -1717,12 +1700,12 @@
 	json_logs = json_object_new_array ();
 
 	if (! json_logs)
-		goto error;
+		return json;
 
-	for (int i = 0; i < PROCESS_LAST; i++) {
+	for (int process = 0; process < PROCESS_LAST; process++) {
 		json_object *json_log;
 
-		json_log = log_serialise (job->log[i]);
+		json_log = log_serialise (job->log[process]);
 		if (! json_log)
 			goto error;
 
@@ -1732,10 +1715,6 @@
 
 	json_object_object_add (json, "log", json_logs);
 
-#if 1
-	nih_info ("XXX: WARNING (%s:%d) job->log NOT fully handled yet", __func__, __LINE__);
-#endif
-
 	return json;
 
 error:
@@ -1753,6 +1732,7 @@
 json_object *
 job_serialise_all (const NihHash *jobs)
 {
+	int          count = 0;
 	json_object *json;
 
 	nih_assert (jobs);
@@ -1765,6 +1745,7 @@
 		json_object  *json_job;
 		Job *job = (Job *)iter;
 
+		count++;
 		json_job = job_serialise (job);
 
 		if (! json_job)
@@ -1773,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:
@@ -1782,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")) {
@@ -1863,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;
 		}
 	}
@@ -1881,68 +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 1
+	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__);
-#endif
 	/* 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;
-
-	/* FIXME: log!! */
-#if 1
-	nih_info ("XXX: WARNING (%s:%d) job->log NOT handled", __func__, __LINE__);
-#endif
-
-	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;
 }
 
@@ -1961,11 +2005,7 @@
 job_deserialise_all (JobClass *parent, json_object *json)
 {
 	json_object  *json_jobs;
-	json_object  *json_fds;
-	json_object  *json_pid;
 	Job          *job;
-	size_t        len;
-	int           ret;
 
 	nih_assert (parent);
 	nih_assert (json);
@@ -1978,14 +2018,8 @@
 	if (! state_check_json_type (json_jobs, array))
 		goto error;
 
-	/* FIXME: finish!!
-	 *
-	 * - log!!
-	 */
-
 	for (int i = 0; i < json_object_array_length (json_jobs); i++) {
 		json_object    *json_job;
-		nih_local Job  *partial = NULL;
 
 		json_job = json_object_array_get_idx (json_jobs, i);
 		if (! json_job)
@@ -1994,100 +2028,9 @@
 		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 1	
-		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);
-		}
-#endif
-
-
-#if 1
-		/* FIXME: log!!! */
-#endif
+		job = job_deserialise (parent, json_job);
+		if (! job)
+			goto error;
 
 	}
 
@@ -2263,7 +2206,6 @@
 /**
  * job_deserialise_kill_timer:
  *
- * @parent: parent for timer.
  * @json: JSON representation of NihTimer.
  *
  * Deserialise @json back into an NihTimer.
@@ -2271,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-08-29 18:44:25 +0000
+++ init/job_class.c	2012-09-11 00:41:22 +0000
@@ -1659,28 +1659,25 @@
 		goto error;
 	json_object_object_add (json, "export", json_export);
 
-	/* set "start/stop on" in the JSON even if no condition specified.
-	 */
-#if 1
-	/* FIXME: shouldn't we just encode condition if it exists?? */
-#endif
-	start_on = class->start_on
-		? event_operator_collapse (class->start_on)
-		: NIH_MUST (nih_strdup (NULL, ""));
-	if (! start_on)
-		goto error;
-
-	if (! state_set_json_string_var (json, "start_on", start_on))
-		goto error;
-
-	stop_on = class->stop_on
-		? event_operator_collapse (class->stop_on)
-		: NIH_MUST (nih_strdup (NULL, ""));
-	if (! stop_on)
-		goto error;
-
-	if (! state_set_json_string_var (json, "stop_on", stop_on))
-		goto error;
+	if (class->start_on)
+	{
+		start_on = event_operator_collapse (class->start_on);
+		if (! start_on)
+			goto error;
+
+		if (! state_set_json_string_var (json, "start_on", start_on))
+			goto error;
+	}
+
+	if (class->stop_on)
+	{
+		stop_on = event_operator_collapse (class->stop_on);
+		if (! stop_on)
+			goto error;
+
+		if (! state_set_json_string_var (json, "stop_on", stop_on))
+			goto error;
+	}
 
 	json_emits = class->emits
 		? state_serialise_str_array (class->emits)
@@ -1798,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);
@@ -1837,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 */
@@ -1888,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 ();
@@ -1913,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 ();
@@ -1931,75 +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))
-			goto error;
-
-	/* normalexit and normalexit_len handled by caller */
+	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;
 }
 
@@ -2015,9 +2035,7 @@
 int
 job_class_deserialise_all (json_object *json)
 {
-	json_object  *json_normalexit;
 	JobClass     *class = NULL;
-	int           ret;
 
 	nih_assert (json);
 
@@ -2033,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)
@@ -2042,13 +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));
-
-#if 1
 		/* FIXME:
 		 *
 		 * If user sessions exist (ie 'initctl --session list'
@@ -2058,107 +2072,7 @@
 		 * path set by job_class_new()='/com/ubuntu/Upstart/jobs/_/1000/bang'
 		 *
 		 */
-#endif
-
-		/* 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;
@@ -2250,3 +2164,59 @@
 
 	return -1;
 }
+
+/**
+ * job_class_prepare_reexec:
+ *
+ * Prepare for a re-exec by clearing the CLOEXEC bit on all log object
+ * file descriptors associated with their parent jobs.
+ **/
+void
+job_class_prepare_reexec (void)
+{
+	job_class_init ();
+
+	NIH_HASH_FOREACH (job_classes, iter) {
+		JobClass *class = (JobClass *)iter;
+
+		NIH_HASH_FOREACH (class->instances, job_iter) {
+			Job *job = (Job *)job_iter;
+
+			nih_assert (job->log);
+
+			for (int process = 0; process < PROCESS_LAST; process++) {
+				int  fd;
+				Log *log;
+
+				log = job->log[process];
+
+				/* No associated job process or logger has detected
+				 * remote end of pty has closed.
+				 */
+				if (! log || ! log->io)
+					continue;
+
+				nih_assert (log->io->watch);
+
+				fd = log->io->watch->fd;
+				if (fd < 0)
+					continue;
+
+				if (state_toggle_cloexec (fd, FALSE) < 0)
+					goto error;
+
+				fd = log->fd;
+				if (fd < 0)
+					continue;
+
+				if (state_toggle_cloexec (fd, FALSE) < 0)
+					goto error;
+			}
+		}
+	}
+
+	return;
+
+error:
+	nih_warn (_("unable to clear CLOEXEC bit on log fd"));
+}

=== modified file 'init/job_class.h'
--- init/job_class.h	2012-08-29 18:44:25 +0000
+++ init/job_class.h	2012-09-11 00:41:22 +0000
@@ -318,6 +318,8 @@
 JobClass * job_class_get (const char *name, Session *session)
 	__attribute__ ((warn_unused_result));
 
+void job_class_prepare_reexec (void);
+
 NIH_END_EXTERN
 
 #endif /* INIT_JOB_CLASS_H */

=== modified file 'init/log.c'
--- init/log.c	2012-08-23 17:01:48 +0000
+++ init/log.c	2012-09-11 00:41:22 +0000
@@ -638,6 +638,8 @@
 		if (nih_io_buffer_resize (io->recv_buf, LOG_READ_SIZE) < 0)
 			break;
 
+		errno = 0;
+
 		/* Append to buffer */
 		len = read (io->watch->fd,
 				io->recv_buf->buf + io->recv_buf->len,
@@ -680,22 +682,23 @@
 		 * causes the loop to be exited.
 		 */
 		if (len <= 0) {
+			/* Job process has ended and we've drained all the data the job
+			 * produced, so remote end must have closed.
+			 *
+			 * This cannot be handled entirely by log_io_error_handler()
+			 * since the job may produce some output prior to disks being
+			 * writeable, then end without producing further output.
+			 * In this scenario the error handler is never called.
+			 *
+			 */
+			if (saved && saved != EAGAIN && saved != EWOULDBLOCK)
+				log->remote_closed = 1;
+
 			close (log->fd);
 			log->fd = -1;
 			break;
 		}
 	}
-
-	/* Job process has ended and we've drained all the data the job
-	 * produced, so remote end must have closed.
-	 *
-	 * This cannot be handled entirely by log_io_error_handler()
-	 * since the job may produce some output prior to disks being
-	 * writeable, then end without producing further output.
-	 * In this scenario the error handler is never called.
-	 *
-	 */
-	log->remote_closed = 1;
 }
 
 /**
@@ -821,20 +824,35 @@
  * Returns: JSON-serialised Log object, or NULL on error.
  **/
 json_object *
-log_serialise (const Log *log)
+log_serialise (Log *log)
 {
-	json_object  *json;
+	json_object     *json;
+	nih_local char  *unflushed_hex = NULL;
 
 	json = json_object_new_object ();
 	if (! json)
 		return NULL;
 
-	if (! log)
+	if (! log || ! log->io || log->remote_closed) {
+		/* Create a "placeholder" log object for non-existent
+		 * log objects and for those that are no longer usable.
+		 */
+		if (! state_set_json_string_var (json, "path", ""))
+			goto error;
 		return json;
+	}
+
+	/* Attempt to flush any cached data */
+	log_flush (log);
 
 	if (! state_set_json_int_var_from_obj (json, log, fd))
 		goto error;
 
+	nih_assert (log->io->watch);
+
+	if (! state_set_json_int_var (json, "io_watch_fd", log->io->watch->fd))
+		goto error;
+
 	if (! state_set_json_string_var_from_obj (json, log, path))
 		goto error;
 
@@ -843,9 +861,19 @@
 	if (! state_set_json_int_var_from_obj (json, log, uid))
 		goto error;
 
+	/* Encode unflushed data as hex to ensure any embedded
+	 * nulls are handled.
+	 */
 	if (log->unflushed->len) {
-	       if (! state_set_json_string_var (json, "unflushed", log->unflushed->buf))
-		       goto error;
+		unflushed_hex = state_data_to_hex (NULL,
+				log->unflushed->buf,
+				log->unflushed->len);
+
+		if (! unflushed_hex)
+			goto error;
+
+		if (! state_set_json_string_var (json, "unflushed", unflushed_hex))
+			goto error;
 	}
 
 	if (! state_set_json_int_var_from_obj (json, log, detached))
@@ -868,18 +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);
 
@@ -888,43 +921,71 @@
 	if (! state_check_json_type (json, object))
 		return NULL;
 
-	partial = nih_new (NULL, Log);
-	if (! partial)
-		return NULL;
-
-	memset (partial, '\0', sizeof (Log));
-
-	if (! state_get_json_int_var_to_obj (json, partial, fd))
-		goto error;
-
-	if (! state_get_json_string_var_to_obj (json, partial, path))
-		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)
-		goto error;
-
-	if (! state_get_json_string_var (json, "unflushed", NULL, unflushed))
-		goto error;
-
-	if (nih_io_buffer_push (partial->unflushed, unflushed, strlen (unflushed)) < 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_string_var (json, "path", NULL, path))
+		return NULL;
+
+	if (! *path) {
+		/* placeholder log object */
+		return NULL;
+	}
+
+	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 (log->fd != -1) {
+		if (state_toggle_cloexec (log->fd, TRUE) < 0)
+			goto error;
+	}
+
+	log->unflushed = nih_io_buffer_new (log);
+	if (! log->unflushed)
+		goto error;
+
+	json_unflushed = json_object_object_get (json, "unflushed");
+	if (json_unflushed) {
+		if (! state_get_json_string_var (json, "unflushed", NULL, unflushed_hex))
+			goto error;
+
+		ret = state_hex_to_data (NULL,
+				unflushed_hex,
+				strlen (unflushed_hex),
+				&unflushed,
+				&len);
+
+		if (ret < 0)
+			goto error;
+
+		if (nih_io_buffer_push (log->unflushed, unflushed, len) < 0)
+			goto error;
+	}
+
+	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-08-23 17:01:48 +0000
+++ init/log.h	2012-09-11 00:41:22 +0000
@@ -88,9 +88,9 @@
 int   log_clear_unflushed    (void)
 	__attribute__ ((warn_unused_result));
 void  log_unflushed_init     (void);
-json_object * log_serialise (const Log *log)
+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/main.c'
--- init/main.c	2012-08-24 15:52:22 +0000
+++ init/main.c	2012-09-11 00:41:22 +0000
@@ -491,7 +491,7 @@
 	NIH_MUST (conf_source_new (NULL, CONFFILE, CONF_FILE));
 	NIH_MUST (conf_source_new (NULL, conf_dir, CONF_JOB_DIR));
 
-	conf_reload (restart);
+	conf_reload ();
 
 	/* Create a listening server for private connections. */
 	if (use_session_bus == FALSE) {
@@ -513,7 +513,7 @@
 	 * fail (since dbus-daemon probably isn't running yet) and will try again
 	 * later - don't let ENOMEM stop us though.
 	 */
-	while (control_bus_open (restart) < 0) {
+	while (control_bus_open () < 0) {
 		NihError *err;
 		int       number;
 
@@ -831,7 +831,7 @@
 	     NihSignal *signal)
 {
 	nih_info (_("Reloading configuration"));
-	conf_reload (restart);
+	conf_reload ();
 }
 
 /**
@@ -849,7 +849,7 @@
 	if (! control_bus) {
 		nih_info (_("Reconnecting to system bus"));
 
-		if (control_bus_open (restart) < 0) {
+		if (control_bus_open () < 0) {
 			NihError *err;
 
 			err = nih_error_get ();
@@ -1033,6 +1033,9 @@
 	/* retain the D-Bus connection across the re-exec */
 	control_prepare_reexec ();
 
+	/* Clear CLOEXEC flag for any job log objects prior to re-exec */
+	job_class_prepare_reexec ();
+
 	pid = fork ();
 
 	if (pid < 0)

=== modified file 'init/parse_job.c'
--- init/parse_job.c	2012-08-23 17:01:48 +0000
+++ init/parse_job.c	2012-09-11 00:41:22 +0000
@@ -520,7 +520,7 @@
  * Returns: EventOperator at root of expression tree on success, NULL
  * on raised error.
  **/
-EventOperator *
+static EventOperator *
 parse_on (JobClass        *class,
 	  NihConfigStanza *stanza,
 	  const char      *file,

=== modified file 'init/paths.h'
--- init/paths.h	2012-06-19 16:40:35 +0000
+++ init/paths.h	2012-09-11 00:41:22 +0000
@@ -127,34 +127,6 @@
 #endif
 
 /**
- * UPSTART:
- *
- * The upstart binary.
- **/
-#ifndef UPSTART
-
-/* * * * * * * *  * * *** * * * * * * * * * ** * * * * * ** * *  * * */
-/* * * * ** * **** * ** ** * * * * * **  * * ** * * * * * *  * * *  */
-/* FIXME */
-/* FIXME */
-/* FIXME: 
- *
- */
-
-#if 0
-#define UPSTART SBINDIR "/init"
-#endif
-#define UPSTART "/data/bzr/upstart/upstart/init/init"
-
-/* FIXME */
-/* FIXME */
-/* * * * ** * **** * ** ** * * * * * **  * * ** * * * * * *  * * *  */
-/* * * * * * * *  * * *** * * * * * * * * * ** * * * * * ** * *  * * */
-/* * * * ** * **** * ** ** * * * * * **  * * ** * * * * * *  * * *  */
-
-#endif
-
-/**
  * JOB_LOGDIR:
  *
  * Directory that jobs which specify CONSOLE_LOG will have their output

=== modified file 'init/process.c'
--- init/process.c	2012-08-28 16:29:50 +0000
+++ init/process.c	2012-09-11 00:41:22 +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-08-14 16:13:48 +0000
+++ init/session.c	2012-09-11 00:41:22 +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,19 +533,12 @@
 session_deserialise_all (json_object *json)
 {
 	Session            *session;
-	nih_local Session  *partial = NULL;
 
 	nih_assert (json);
 
 	session_init ();
 
-	/* FIXME: enable for final build */
-#if PRODUCTION_BUILD
 	nih_assert (NIH_LIST_EMPTY (sessions));
-#else
-	nih_warn ("XXX: WARNING (%s:%d): NIH_LIST_EMPTY(sessions) check disabled",
-			__func__, __LINE__);
-#endif
 
 	json_sessions = json_object_object_get (json, "sessions");
 
@@ -560,20 +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->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.c'
--- init/state.c	2012-08-24 16:15:52 +0000
+++ init/state.c	2012-09-11 00:41:22 +0000
@@ -46,7 +46,6 @@
 json_object *json_sessions = NULL;
 json_object *json_events = NULL;
 json_object *json_classes = NULL;
-json_object *json_control_conns = NULL;
 
 extern int use_session_bus;
 
@@ -73,16 +72,6 @@
 state_get_job (const char *job_class, const char *job_name)
 	__attribute__ ((warn_unused_result));
 
-static char *
-state_data_to_hex (void *parent, const void *data, size_t len)
-	__attribute__ ((warn_unused_result));
-
-static int
-state_hex_to_data (void *parent, const void *hex_data,
-		   size_t hex_len, char **data,
-		   size_t *data_len)
-	__attribute__ ((warn_unused_result));
-
 /**
  * state_read:
  *
@@ -369,12 +358,6 @@
 
 	json_object_object_add (json, "sessions", json_sessions);
 
-	json_control_conns = control_serialise_all ();
-	if (! json_control_conns)
-		goto error;
-
-	json_object_object_add (json, "control_conns", json_control_conns);
-
 	json_events = event_serialise_all ();
 	if (! json_events)
 		goto error;
@@ -480,9 +463,6 @@
 	if (job_class_deserialise_all (json) < 0)
 		goto out;
 
-	if (control_deserialise_all (json) < 0)
-		goto out;
-
 	if (state_deserialise_resolve_deps (json) < 0)
 		goto out;
 
@@ -644,7 +624,6 @@
 	size_t    len = 0;
 	char    **array = NULL;
 
-	nih_assert (parent);
 	nih_assert (json);
 
 	if (! state_check_json_type (json, array))
@@ -1200,7 +1179,6 @@
 	nih_assert (json_sessions);
 	nih_assert (json_events);
 	nih_assert (json_classes);
-	nih_assert (json_control_conns);
 
 	for (int i = 0; i < json_object_array_length (json_events); i++) {
 		json_object  *json_event;
@@ -1778,7 +1756,7 @@
  * Returns: newly-allocated hex-encoded string,
  * or NULL on error.
  **/
-static char *
+char *
 state_data_to_hex (void *parent, const void *data, size_t len)
 {
 	unsigned char  *p;
@@ -1818,8 +1796,8 @@
  *
  * Returns: 0 on success, -1 on error.
  **/
-static int
-state_hex_to_data (void         *parent,
+int
+state_hex_to_data (void      *parent,
 		const void   *hex_data,
 		size_t        hex_len,
 		char        **data,

=== modified file 'init/state.h'
--- init/state.h	2012-08-24 15:52:22 +0000
+++ init/state.h	2012-09-11 00:41:22 +0000
@@ -57,8 +57,6 @@
  * XXX:XXX: * XXX:XXX: * XXX:XXX: * XXX:XXX: * XXX:XXX: * XXX:XXX:
  *--------------------------------------------------------------------
  *
- * - remove all PRODUCTION_BUILD macros and adopt production flow.
- *
  * - check "NULL session" deserialisation handling.
  *
  * - XXX: audit memory management for all *_deserialise() and
@@ -108,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:
@@ -1144,6 +1125,15 @@
 int state_fd_valid (int fd)
 	__attribute__ ((warn_unused_result));
 
+char * state_data_to_hex (void *parent, const void *data,
+			  size_t len)
+	__attribute__ ((warn_unused_result));
+
+int state_hex_to_data (void *parent, const void *hex_data,
+		       size_t hex_len, char **data,
+		       size_t *data_len)
+	__attribute__ ((warn_unused_result));
+
 NIH_END_EXTERN
 
 #endif /* INIT_STATE_H */

=== modified file 'init/tests/test_conf.c'
--- init/tests/test_conf.c	2012-08-24 19:55:22 +0000
+++ init/tests/test_conf.c	2012-09-11 00:41:22 +0000
@@ -4549,7 +4549,7 @@
 	strcat (filename, "/baz");
 	source3 = conf_source_new (NULL, filename, CONF_DIR);
 
-	conf_reload (FALSE);
+	conf_reload ();
 
 	TEST_HASH_NOT_EMPTY (source1->files);
 

=== modified file 'init/tests/test_control.c'
--- init/tests/test_control.c	2012-08-24 20:08:54 +0000
+++ init/tests/test_control.c	2012-09-11 00:41:22 +0000
@@ -486,7 +486,7 @@
 	setenv ("DBUS_SYSTEM_BUS_ADDRESS",
 		"unix:abstract=/com/ubuntu/upstart/test", TRUE);
 
-	ret = control_bus_open (FALSE);
+	ret = control_bus_open ();
 
 	TEST_EQ (ret, 0);
 	TEST_NE_P (control_bus, NULL);
@@ -571,7 +571,7 @@
 	setenv ("DBUS_SYSTEM_BUS_ADDRESS",
 		"unix:abstract=/com/ubuntu/upstart/test", TRUE);
 
-	ret = control_bus_open (FALSE);
+	ret = control_bus_open ();
 
 	TEST_EQ (ret, 0);
 	TEST_NE_P (control_bus, NULL);
@@ -675,7 +675,7 @@
 	setenv ("DBUS_SYSTEM_BUS_ADDRESS",
 		"unix:abstract=/com/ubuntu/upstart/test", TRUE);
 
-	ret = control_bus_open (FALSE);
+	ret = control_bus_open ();
 
 	TEST_LT (ret, 0);
 	TEST_EQ_P (control_bus, NULL);
@@ -739,7 +739,7 @@
 	setenv ("DBUS_SYSTEM_BUS_ADDRESS",
 		"unix:abstract=/com/ubuntu/upstart/test", TRUE);
 
-	ret = control_bus_open (FALSE);
+	ret = control_bus_open ();
 
 	TEST_LT (ret, 0);
 	TEST_EQ_P (control_bus, NULL);
@@ -767,7 +767,7 @@
 	setenv ("DBUS_SYSTEM_BUS_ADDRESS",
 		"unix:abstract=/com/ubuntu/upstart/test", TRUE);
 
-	ret = control_bus_open (FALSE);
+	ret = control_bus_open ();
 
 	TEST_LT (ret, 0);
 	TEST_EQ_P (control_bus, NULL);
@@ -802,7 +802,7 @@
 
 	assert (NIH_LIST_EMPTY (control_conns));
 
-	assert0 (control_bus_open (FALSE));
+	assert0 (control_bus_open ());
 	assert (control_bus != NULL);
 
 	assert (! NIH_LIST_EMPTY (control_conns));
@@ -856,7 +856,7 @@
 
 	TEST_DBUS (dbus_pid);
 
-	assert0 (control_bus_open (FALSE));
+	assert0 (control_bus_open ());
 	assert (control_bus != NULL);
 
 	assert (! NIH_LIST_EMPTY (control_conns));

=== modified file 'init/tests/test_event_operator.c'
--- init/tests/test_event_operator.c	2012-08-31 14:42:40 +0000
+++ init/tests/test_event_operator.c	2012-09-11 00:41:22 +0000
@@ -1327,7 +1327,7 @@
 {
 	JobClass        *job = NULL;
 	EventOperator   *oper1, *oper2;
-	char		*oper1_string;
+	char		    *oper1_string;
 
 	struct test_operator {
 		char *description;