------------------------------------------------------------
revno: 1635
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Mon 2014-06-09 09:37:09 +0100
message:
* Decrufting.
modified:
init/cgroup.c
init/cgroup.h
init/job.c
init/job_process.c
init/tests/test_cgroup.c
--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk
Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'init/cgroup.c'
--- init/cgroup.c 2014-06-04 16:35:01 +0000
+++ init/cgroup.c 2014-06-09 08:37:09 +0000
@@ -546,7 +546,6 @@
return NULL;
}
-
/**
* cgroup_name_serialise_all:
*
@@ -1084,7 +1083,6 @@
pid, controller);
}
-
/* Ask cgmanager to create the cgroup */
ret = cgmanager_create_sync (NULL,
cgroup_manager,
@@ -1371,7 +1369,6 @@
if (ret < 0)
return FALSE;
-
}
nih_debug ("Applied cgroup settings to '%s' controller cgroup '%s'",
=== modified file 'init/cgroup.h'
--- init/cgroup.h 2014-05-09 15:54:41 +0000
+++ init/cgroup.h 2014-06-09 08:37:09 +0000
@@ -4,12 +4,6 @@
* - add missing states for other job processes.
* - add serialisation / deserialisation support!
*
- * - XXX: block job from starting unless cgroup_support_enabled() and
- * cgmanager_connected().
- *
- * - XXX: need to avoid events being destroyed if a job needs them but
- * it is blocked on the cgmanager starting!!
- *
* - test scenarios:
* - setuid + cgroup
* - setgid + cgroup
=== modified file 'init/job.c'
--- init/job.c 2014-06-05 22:35:01 +0000
+++ init/job.c 2014-06-09 08:37:09 +0000
@@ -2253,7 +2253,6 @@
}
}
-
if (json_object_object_get_ex (json, "process_data", &json_process_data)) {
if (! state_check_json_type (json_process_data, array))
goto error;
=== modified file 'init/job_process.c'
--- init/job_process.c 2014-06-05 22:35:01 +0000
+++ init/job_process.c 2014-06-09 08:37:09 +0000
@@ -2582,7 +2582,6 @@
job_process_run_bottom (JobProcessData *process_data)
{
Job *job;
- //JobState state;
char *script;
int shell_fd;
@@ -2591,7 +2590,6 @@
job = process_data->job;
shell_fd = process_data->shell_fd;
script = process_data->script;
- //state = process_data->state;
/* Handle job process containing a script section by sending the
* script to the child shell.
@@ -2639,10 +2637,6 @@
process_data->valid = FALSE;
}
- /* Success, so change the job state */
- //job->state = state;
- //job->state = job_next_state (job);
-
NIH_LIST_FOREACH (control_conns, iter) {
NihListEntry *entry = (NihListEntry *)iter;
DBusConnection *conn = (DBusConnection *)entry->data;
=== modified file 'init/tests/test_cgroup.c'
--- init/tests/test_cgroup.c 2014-06-03 14:48:42 +0000
+++ init/tests/test_cgroup.c 2014-06-09 08:37:09 +0000
@@ -2,7 +2,7 @@
*
* test_cgroup.c - test suite for init/cgroup.c
*
- * Copyright 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
* Author: James Hunt <[email protected]>.
*
* This program is free software; you can redistribute it and/or modify
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
