Bugzilla – Attachment 621005 Details for
Bug 878853
No output upon reboot
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Forgot Password
[patch]
upstream-fix-hanging-ssh-sessions-at-shutdown.patch
upstream-fix-hanging-ssh-sessions-at-shutdown.patch (text/plain), 160.90 KB, created by
Thomas Blume
on 2015-01-27 11:34:45 UTC
(
hide
)
Description:
upstream-fix-hanging-ssh-sessions-at-shutdown.patch
Filename:
MIME Type:
Creator:
Thomas Blume
Created:
2015-01-27 11:34:45 UTC
Size:
160.90 KB
patch
obsolete
>diff -Naur systemd-208.mod.bck/src/core/dbus-scope.c systemd-208.mod/src/core/dbus-scope.c >--- systemd-208.mod.bck/src/core/dbus-scope.c 2013-08-13 22:02:46.000000000 +0200 >+++ systemd-208.mod/src/core/dbus-scope.c 2015-01-26 17:05:21.141276740 +0100 >@@ -30,11 +30,14 @@ > > #define BUS_SCOPE_INTERFACE \ > " <interface name=\"org.freedesktop.systemd1.Scope\">\n" \ >+ " <method name=\"Abandon\"/>\n" \ > BUS_UNIT_CGROUP_INTERFACE \ >+ " <property name=\"Controller\" type=\"s\" access=\"read\"/>\n"\ > " <property name=\"TimeoutStopUSec\" type=\"t\" access=\"read\"/>\n" \ > BUS_KILL_CONTEXT_INTERFACE \ > BUS_CGROUP_CONTEXT_INTERFACE \ > " <property name=\"Result\" type=\"s\" access=\"read\"/>\n" \ >+ " <signal name=\"RequestStop\"/>\n" \ > " </interface>\n" > > #define INTROSPECTION \ >@@ -56,6 +59,7 @@ > static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_scope_append_scope_result, scope_result, ScopeResult); > > static const BusProperty bus_scope_properties[] = { >+ { "Controller", bus_property_append_string, "s", offsetof(Scope, controller) }, > { "TimeoutStopUSec", bus_property_append_usec, "t", offsetof(Scope, timeout_stop_usec) }, > { "Result", bus_scope_append_scope_result, "s", offsetof(Scope, result) }, > {} >@@ -63,19 +67,40 @@ > > DBusHandlerResult bus_scope_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) { > Scope *s = SCOPE(u); >+ _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; > >- const BusBoundProperties bps[] = { >+ SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status"); >+ >+ if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Scope", "Abandon")) { >+ int r; >+ >+ r = scope_abandon(s); >+ if (r < 0) >+ log_error("Failed to mark scope %s as abandoned : %s", UNIT(s)->id, strerror(-r)); >+ >+ reply = dbus_message_new_method_return(message); >+ if (!reply) >+ goto oom; >+ } else { >+ const BusBoundProperties bps[] = { > { "org.freedesktop.systemd1.Unit", bus_unit_properties, u }, > { "org.freedesktop.systemd1.Scope", bus_unit_cgroup_properties, u }, > { "org.freedesktop.systemd1.Scope", bus_scope_properties, s }, > { "org.freedesktop.systemd1.Scope", bus_cgroup_context_properties, &s->cgroup_context }, > { "org.freedesktop.systemd1.Scope", bus_kill_context_properties, &s->kill_context }, > {} >- }; >+ }; > >- SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status"); >+ return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps); >+ } > >- return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps); >+ if (reply) >+ if (!bus_maybe_send_reply(c, message, reply)) >+ goto oom; >+ >+ return DBUS_HANDLER_RESULT_HANDLED; >+oom: >+ return DBUS_HANDLER_RESULT_NEED_MEMORY; > } > > static int bus_scope_set_transient_property( >@@ -99,10 +124,6 @@ > dbus_message_iter_get_element_type(i) != DBUS_TYPE_UINT32) > return -EINVAL; > >- r = set_ensure_allocated(&s->pids, trivial_hash_func, trivial_compare_func); >- if (r < 0) >- return r; >- > dbus_message_iter_recurse(i, &sub); > while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_UINT32) { > uint32_t pid; >@@ -113,7 +134,7 @@ > return -EINVAL; > > if (mode != UNIT_CHECK) { >- r = set_put(s->pids, LONG_TO_PTR(pid)); >+ r = unit_watch_pid(UNIT(s), pid); > if (r < 0 && r != -EEXIST) > return r; > } >@@ -127,6 +148,31 @@ > > return 1; > >+ } else if (streq(name, "Controller")) { >+ const char *controller; >+ >+ if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING) >+ return -EINVAL; >+ >+ dbus_message_iter_get_basic(i, &controller); >+ >+ if (!isempty(controller) && !bus_service_name_is_valid(controller)) >+ return -EINVAL; >+ >+ if (mode != UNIT_CHECK) { >+ char *c = NULL; >+ >+ if (!isempty(controller)) { >+ c = strdup(controller); >+ if (!c) >+ return -ENOMEM; >+ } >+ >+ free(s->controller); >+ s->controller = c; >+ } >+ >+ return 1; > } else if (streq(name, "TimeoutStopUSec")) { > > if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_UINT64) >@@ -187,3 +233,30 @@ > unit_realize_cgroup(u); > return 0; > } >+ >+int bus_scope_send_request_stop(Scope *s) { >+ _cleanup_dbus_message_unref_ DBusMessage *m = NULL; >+ _cleanup_free_ char *p = NULL; >+ int r; >+ >+ assert(s); >+ >+ if (!s->controller) >+ return 0; >+ >+ p = unit_dbus_path(UNIT(s)); >+ if (!p) >+ return -ENOMEM; >+ >+ m = dbus_message_new_signal(p, >+ "org.freedesktop.systemd1.Scope", >+ "RequestStop"); >+ if (!m) >+ return 0; >+ >+ r = dbus_message_set_destination(m, s->controller); >+ if (!r) >+ return 0; >+ >+ return dbus_connection_send(UNIT(s)->manager->api_bus, m, NULL); >+} >diff -Naur systemd-208.mod.bck/src/core/dbus-scope.h systemd-208.mod/src/core/dbus-scope.h >--- systemd-208.mod.bck/src/core/dbus-scope.h 2013-08-13 22:02:46.000000000 +0200 >+++ systemd-208.mod/src/core/dbus-scope.h 2015-01-26 17:05:13.845248893 +0100 >@@ -30,4 +30,6 @@ > int bus_scope_set_property(Unit *u, const char *name, DBusMessageIter *i, UnitSetPropertiesMode mode, DBusError *error); > int bus_scope_commit_properties(Unit *u); > >+int bus_scope_send_request_stop(Scope *s); >+ > extern const char bus_scope_interface[]; >diff -Naur systemd-208.mod.bck/src/core/manager.c systemd-208.mod/src/core/manager.c >--- systemd-208.mod.bck/src/core/manager.c 2013-10-01 00:17:21.000000000 +0200 >+++ systemd-208.mod/src/core/manager.c 2015-01-26 17:05:21.141276740 +0100 >@@ -1389,7 +1389,7 @@ > log_debug_unit(u->id, > "Child %lu belongs to %s", (long unsigned) si.si_pid, u->id); > >- hashmap_remove(m->watch_pids, LONG_TO_PTR(si.si_pid)); >+ unit_unwatch_pid(u, si.si_pid); > UNIT_VTABLE(u)->sigchld_event(u, si.si_pid, si.si_code, si.si_status); > } > >diff -Naur systemd-208.mod.bck/src/core/scope.c systemd-208.mod/src/core/scope.c >--- systemd-208.mod.bck/src/core/scope.c 2013-09-25 03:38:17.000000000 +0200 >+++ systemd-208.mod/src/core/scope.c 2015-01-26 17:05:21.141276740 +0100 >@@ -35,6 +35,7 @@ > static const UnitActiveState state_translation_table[_SCOPE_STATE_MAX] = { > [SCOPE_DEAD] = UNIT_INACTIVE, > [SCOPE_RUNNING] = UNIT_ACTIVE, >+ [SCOPE_ABANDONED] = UNIT_ACTIVE, > [SCOPE_STOP_SIGTERM] = UNIT_DEACTIVATING, > [SCOPE_STOP_SIGKILL] = UNIT_DEACTIVATING, > [SCOPE_FAILED] = UNIT_FAILED >@@ -64,8 +65,8 @@ > > cgroup_context_done(&s->cgroup_context); > >- set_free(s->pids); >- s->pids = NULL; >+ free(s->controller); >+ s->controller = NULL; > > unit_unwatch_timer(u, &s->timer_watch); > } >@@ -81,6 +82,9 @@ > state != SCOPE_STOP_SIGKILL) > unit_unwatch_timer(UNIT(s), &s->timer_watch); > >+ if (state == SCOPE_DEAD || state == SCOPE_FAILED) >+ unit_unwatch_all_pids(UNIT(s)); >+ > if (state != old_state) > log_debug("%s changed %s -> %s", > UNIT(s)->id, >@@ -112,7 +116,7 @@ > if (UNIT(s)->load_state != UNIT_LOADED) > return 0; > >- if (set_size(s->pids) <= 0 && UNIT(s)->manager->n_reloading <= 0) { >+ if (set_size(UNIT(s)->pids) <= 0 && UNIT(s)->manager->n_reloading <= 0) { > log_error_unit(UNIT(s)->id, "Scope %s has no PIDs. Refusing.", UNIT(s)->id); > return -EINVAL; > } >@@ -166,6 +170,9 @@ > return r; > } > >+ if (s->deserialized_state != SCOPE_DEAD && s->deserialized_state != SCOPE_FAILED) >+ unit_watch_all_pids(UNIT(s)); >+ > scope_set_state(s, s->deserialized_state); > } > >@@ -198,6 +205,7 @@ > } > > static void scope_enter_signal(Scope *s, ScopeState state, ScopeResult f) { >+ bool skip_signal = false; > int r; > > assert(s); >@@ -205,13 +213,25 @@ > if (f != SCOPE_SUCCESS) > s->result = f; > >- r = unit_kill_context( >+ unit_watch_all_pids(UNIT(s)); >+ >+ /* If we have a controller set let's ask the controller nicely >+ * to terminate the scope, instead of us going directly into >+ * SIGTERM beserk mode */ >+ if (state == SCOPE_STOP_SIGTERM) >+ skip_signal = bus_scope_send_request_stop(s) > 0; >+ >+ if (!skip_signal) { >+ r = unit_kill_context( > UNIT(s), > &s->kill_context, > state != SCOPE_STOP_SIGTERM, > -1, -1, false); >- if (r < 0) >- goto fail; >+ >+ if (r < 0) >+ goto fail; >+ } else >+ r = 1; > > if (r > 0) { > if (s->timeout_stop_usec > 0) { >@@ -257,13 +277,10 @@ > return r; > } > >- r = cg_attach_many_everywhere(u->manager->cgroup_supported, u->cgroup_path, s->pids); >+ r = cg_attach_many_everywhere(u->manager->cgroup_supported, u->cgroup_path, UNIT(s)->pids); > if (r < 0) > return r; > >- set_free(s->pids); >- s->pids = NULL; >- > s->result = SCOPE_SUCCESS; > > scope_set_state(s, SCOPE_RUNNING); >@@ -274,13 +291,13 @@ > Scope *s = SCOPE(u); > > assert(s); >- assert(s->state == SCOPE_RUNNING); > > if (s->state == SCOPE_STOP_SIGTERM || > s->state == SCOPE_STOP_SIGKILL) > return 0; > >- assert(s->state == SCOPE_RUNNING); >+ assert(s->state == SCOPE_RUNNING || >+ s->state == SCOPE_ABANDONED); > > scope_enter_signal(s, SCOPE_STOP_SIGTERM, SCOPE_SUCCESS); > return 0; >@@ -344,7 +361,7 @@ > /* Never clean up scopes that still have a process around, > * even if the scope is formally dead. */ > >- if (UNIT(s)->cgroup_path) { >+ if (u->cgroup_path) { > r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, UNIT(s)->cgroup_path, true); > if (r <= 0) > return true; >@@ -353,6 +370,33 @@ > return false; > } > >+static void scope_notify_cgroup_empty_event(Unit *u) { >+ Scope *s = SCOPE(u); >+ >+ assert(u); >+ >+ log_debug_unit(u->id, "%s: cgroup is empty", u->id); >+ >+ if (s->state == SCOPE_RUNNING || s->state == SCOPE_ABANDONED || >+ s->state == SCOPE_STOP_SIGTERM || SCOPE_STOP_SIGKILL) >+ scope_enter_dead(s, SCOPE_SUCCESS); >+} >+ >+static void scope_sigchld_event(Unit *u, pid_t pid, int code, int status) { >+ /* If we get a SIGCHLD event for one of the processes we were >+ interested in, then we look for others to watch, under the >+ assumption that we'll sooner or later get a SIGCHLD for >+ them, as the original process we watched was probably the >+ parent of them, and they are hence now our children. */ >+ >+ unit_tidy_watch_pids(u, 0, 0); >+ unit_watch_all_pids(u); >+ >+ /* If the PID set is empty now, then let's finish this off */ >+ if (set_isempty(u->pids)) >+ scope_notify_cgroup_empty_event(u); >+} >+ > static void scope_timer_event(Unit *u, uint64_t elapsed, Watch*w) { > Scope *s = SCOPE(u); > >@@ -383,24 +427,30 @@ > } > } > >-static void scope_notify_cgroup_empty_event(Unit *u) { >- Scope *s = SCOPE(u); >- assert(u); >+int scope_abandon(Scope *s) { >+ assert(s); > >- log_debug_unit(u->id, "%s: cgroup is empty", u->id); >+ if (s->state != SCOPE_RUNNING && s->state != SCOPE_ABANDONED) >+ return -ESTALE; > >- switch (s->state) { >+ free(s->controller); >+ s->controller = NULL; > >- case SCOPE_RUNNING: >- case SCOPE_STOP_SIGTERM: >- case SCOPE_STOP_SIGKILL: >- scope_enter_dead(s, SCOPE_SUCCESS); >+ /* The client is no longer watching the remaining processes, >+ * so let's step in here, under the assumption that the >+ * remaining processes will be sooner or later reassigned to >+ * us as parent. */ > >- break; >+ unit_tidy_watch_pids(UNIT(s), 0, 0); >+ unit_watch_all_pids(UNIT(s)); > >- default: >- ; >- } >+ /* If the PID set is empty now, then let's finish this off */ >+ if (set_isempty(UNIT(s)->pids)) >+ scope_notify_cgroup_empty_event(UNIT(s)); >+ else >+ scope_set_state(s, SCOPE_ABANDONED); >+ >+ return 0; > } > > _pure_ static UnitActiveState scope_active_state(Unit *u) { >@@ -418,6 +468,7 @@ > static const char* const scope_state_table[_SCOPE_STATE_MAX] = { > [SCOPE_DEAD] = "dead", > [SCOPE_RUNNING] = "running", >+ [SCOPE_ABANDONED] = "abandoned", > [SCOPE_STOP_SIGTERM] = "stop-sigterm", > [SCOPE_STOP_SIGKILL] = "stop-sigkill", > [SCOPE_FAILED] = "failed", >@@ -467,6 +518,8 @@ > > .check_gc = scope_check_gc, > >+ .sigchld_event = scope_sigchld_event, >+ > .timer_event = scope_timer_event, > > .reset_failed = scope_reset_failed, >diff -Naur systemd-208.mod.bck/src/core/scope.h systemd-208.mod/src/core/scope.h >--- systemd-208.mod.bck/src/core/scope.h 2013-08-13 22:02:46.000000000 +0200 >+++ systemd-208.mod/src/core/scope.h 2015-01-26 17:05:21.141276740 +0100 >@@ -29,6 +29,7 @@ > typedef enum ScopeState { > SCOPE_DEAD, > SCOPE_RUNNING, >+ SCOPE_ABANDONED, > SCOPE_STOP_SIGTERM, > SCOPE_STOP_SIGKILL, > SCOPE_FAILED, >@@ -55,13 +56,15 @@ > > usec_t timeout_stop_usec; > >- Set *pids; >+ char *controller; > > Watch timer_watch; > }; > > extern const UnitVTable scope_vtable; > >+int scope_abandon(Scope *s); >+ > const char* scope_state_to_string(ScopeState i) _const_; > ScopeState scope_state_from_string(const char *s) _pure_; > >diff -Naur systemd-208.mod.bck/src/core/service.c systemd-208.mod/src/core/service.c >--- systemd-208.mod.bck/src/core/service.c 2015-01-26 11:25:19.000000000 +0100 >+++ systemd-208.mod/src/core/service.c 2015-01-26 17:05:21.142276762 +0100 >@@ -1612,6 +1612,11 @@ > s->control_command_id = _SERVICE_EXEC_COMMAND_INVALID; > } > >+ if (state == SERVICE_DEAD || >+ state == SERVICE_FAILED || >+ state == SERVICE_AUTO_RESTART) >+ unit_unwatch_all_pids(UNIT(s)); >+ > if (state != SERVICE_START_PRE && > state != SERVICE_START && > state != SERVICE_START_POST && >@@ -1711,8 +1716,14 @@ > return r; > } > >+ if (s->deserialized_state != SERVICE_DEAD && >+ s->deserialized_state != SERVICE_FAILED && >+ s->deserialized_state != SERVICE_AUTO_RESTART) >+ unit_watch_all_pids(UNIT(s)); >+ > if (s->deserialized_state == SERVICE_START_POST || >- s->deserialized_state == SERVICE_RUNNING) >+ s->deserialized_state == SERVICE_RUNNING || >+ s->deserialized_state == SERVICE_RELOAD) > service_handle_watchdog(s); > > service_set_state(s, s->deserialized_state); >@@ -2020,6 +2031,7 @@ > s->result = f; > > service_unwatch_control_pid(s); >+ unit_watch_all_pids(UNIT(s)); > > s->control_command = s->exec_command[SERVICE_EXEC_STOP_POST]; > if (s->control_command) { >@@ -2060,6 +2072,8 @@ > if (f != SERVICE_SUCCESS) > s->result = f; > >+ unit_watch_all_pids(UNIT(s)); >+ > r = unit_kill_context( > UNIT(s), > &s->kill_context, >@@ -2105,6 +2119,7 @@ > s->result = f; > > service_unwatch_control_pid(s); >+ unit_watch_all_pids(UNIT(s)); > > s->control_command = s->exec_command[SERVICE_EXEC_STOP]; > if (s->control_command) { >@@ -3016,6 +3031,62 @@ > service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_RESOURCES); > } > >+static void service_notify_cgroup_empty_event(Unit *u) { >+ Service *s = SERVICE(u); >+ >+ assert(u); >+ >+ log_debug_unit(u->id, "%s: cgroup is empty", u->id); >+ >+ switch (s->state) { >+ >+ /* Waiting for SIGCHLD is usually more interesting, >+ * because it includes return codes/signals. Which is >+ * why we ignore the cgroup events for most cases, >+ * except when we don't know pid which to expect the >+ * SIGCHLD for. */ >+ >+ case SERVICE_START: >+ case SERVICE_START_POST: >+ /* If we were hoping for the daemon to write its PID file, >+ * we can give up now. */ >+ if (s->pid_file_pathspec) { >+ log_warning_unit(u->id, >+ "%s never wrote its PID file. Failing.", UNIT(s)->id); >+ service_unwatch_pid_file(s); >+ if (s->state == SERVICE_START) >+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES); >+ else >+ service_enter_stop(s, SERVICE_FAILURE_RESOURCES); >+ } >+ break; >+ >+ case SERVICE_RUNNING: >+ /* service_enter_running() will figure out what to do */ >+ service_enter_running(s, SERVICE_SUCCESS); >+ break; >+ >+ case SERVICE_STOP_SIGTERM: >+ case SERVICE_STOP_SIGKILL: >+ >+ if (main_pid_good(s) <= 0 && !control_pid_good(s)) >+ service_enter_stop_post(s, SERVICE_SUCCESS); >+ >+ break; >+ >+ case SERVICE_STOP_POST: >+ case SERVICE_FINAL_SIGTERM: >+ case SERVICE_FINAL_SIGKILL: >+ if (main_pid_good(s) <= 0 && !control_pid_good(s)) >+ service_enter_dead(s, SERVICE_SUCCESS, true); >+ >+ break; >+ >+ default: >+ ; >+ } >+} >+ > static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { > Service *s = SERVICE(u); > ServiceResult f; >@@ -3284,6 +3355,18 @@ > > /* Notify clients about changed exit status */ > unit_add_to_dbus_queue(u); >+ >+ /* We got one SIGCHLD for the service, let's watch all >+ * processes that are now running of the service, and watch >+ * that. Among the PIDs we then watch will be children >+ * reassigned to us, which hopefully allows us to identify >+ * when all children are gone */ >+ unit_tidy_watch_pids(u, s->main_pid, s->control_pid); >+ unit_watch_all_pids(u); >+ >+ /* If the PID set is empty now, then let's finish this off */ >+ if (set_isempty(u->pids)) >+ service_notify_cgroup_empty_event(u); > } > > static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) { >@@ -3387,61 +3470,6 @@ > } > } > >-static void service_notify_cgroup_empty_event(Unit *u) { >- Service *s = SERVICE(u); >- >- assert(u); >- >- log_debug_unit(u->id, "%s: cgroup is empty", u->id); >- >- switch (s->state) { >- >- /* Waiting for SIGCHLD is usually more interesting, >- * because it includes return codes/signals. Which is >- * why we ignore the cgroup events for most cases, >- * except when we don't know pid which to expect the >- * SIGCHLD for. */ >- >- case SERVICE_START: >- case SERVICE_START_POST: >- /* If we were hoping for the daemon to write its PID file, >- * we can give up now. */ >- if (s->pid_file_pathspec) { >- log_warning_unit(u->id, >- "%s never wrote its PID file. Failing.", UNIT(s)->id); >- service_unwatch_pid_file(s); >- if (s->state == SERVICE_START) >- service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES); >- else >- service_enter_stop(s, SERVICE_FAILURE_RESOURCES); >- } >- break; >- >- case SERVICE_RUNNING: >- /* service_enter_running() will figure out what to do */ >- service_enter_running(s, SERVICE_SUCCESS); >- break; >- >- case SERVICE_STOP_SIGTERM: >- case SERVICE_STOP_SIGKILL: >- >- if (main_pid_good(s) <= 0 && !control_pid_good(s)) >- service_enter_stop_post(s, SERVICE_SUCCESS); >- >- break; >- >- case SERVICE_FINAL_SIGTERM: >- case SERVICE_FINAL_SIGKILL: >- if (main_pid_good(s) <= 0 && !control_pid_good(s)) >- service_enter_dead(s, SERVICE_SUCCESS, true); >- >- break; >- >- default: >- ; >- } >-} >- > static void service_notify_message(Unit *u, pid_t pid, char **tags) { > Service *s = SERVICE(u); > const char *e; >diff -Naur systemd-208.mod.bck/src/core/service.c.orig systemd-208.mod/src/core/service.c.orig >--- systemd-208.mod.bck/src/core/service.c.orig 2015-01-26 11:25:19.000000000 +0100 >+++ systemd-208.mod/src/core/service.c.orig 2015-01-26 11:25:19.000000000 +0100 >@@ -2725,7 +2725,7 @@ > unit_serialize_item(u, f, "var-tmp-dir", s->exec_context.var_tmp_dir); > > if (s->forbid_restart) >- unit_serialize_item(u, f, "forbid_restart", yes_no(s->forbid_restart)); >+ unit_serialize_item(u, f, "forbid-restart", yes_no(s->forbid_restart)); > > return 0; > } >@@ -2863,12 +2863,12 @@ > return log_oom(); > > s->exec_context.var_tmp_dir = t; >- } else if (streq(key, "forbid_restart")) { >+ } else if (streq(key, "forbid-restart")) { > int b; > > b = parse_boolean(value); > if (b < 0) >- log_debug_unit(u->id, "Failed to parse forbid_restart value %s", value); >+ log_debug_unit(u->id, "Failed to parse forbid-restart value %s", value); > else > s->forbid_restart = b; > } else >diff -Naur systemd-208.mod.bck/src/core/unit.c systemd-208.mod/src/core/unit.c >--- systemd-208.mod.bck/src/core/unit.c 2015-01-26 11:25:19.000000000 +0100 >+++ systemd-208.mod/src/core/unit.c 2015-01-26 17:05:21.142276762 +0100 >@@ -472,6 +472,8 @@ > > set_free_free(u->names); > >+ unit_unwatch_all_pids(u); >+ > condition_free_list(u->conditions); > > unit_ref_unset(&u->slice); >@@ -1652,13 +1654,25 @@ > } > > int unit_watch_pid(Unit *u, pid_t pid) { >+ int q, r; >+ > assert(u); > assert(pid >= 1); > >+ r = set_ensure_allocated(&u->pids, trivial_hash_func, trivial_compare_func); >+ if (r < 0) >+ return r; >+ > /* Watch a specific PID. We only support one unit watching > * each PID for now. */ > >- return hashmap_put(u->manager->watch_pids, LONG_TO_PTR(pid), u); >+ r = set_put(u->pids, LONG_TO_PTR(pid)); >+ >+ q = hashmap_put(u->manager->watch_pids, LONG_TO_PTR(pid), u); >+ if (q < 0) >+ return q; >+ >+ return r; > } > > void unit_unwatch_pid(Unit *u, pid_t pid) { >@@ -1666,6 +1680,102 @@ > assert(pid >= 1); > > hashmap_remove_value(u->manager->watch_pids, LONG_TO_PTR(pid), u); >+ set_remove(u->pids, LONG_TO_PTR(pid)); >+} >+ >+static int watch_pids_in_path(Unit *u, const char *path) { >+ _cleanup_closedir_ DIR *d = NULL; >+ _cleanup_fclose_ FILE *f = NULL; >+ int ret = 0, r; >+ >+ assert(u); >+ assert(path); >+ >+ /* Adds all PIDs from a specific cgroup path to the set of PIDs we watch. */ >+ >+ r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, path, &f); >+ if (r >= 0) { >+ pid_t pid; >+ >+ while ((r = cg_read_pid(f, &pid)) > 0) { >+ r = unit_watch_pid(u, pid); >+ if (r < 0 && ret >= 0) >+ ret = r; >+ } >+ if (r < 0 && ret >= 0) >+ ret = r; >+ >+ } else if (ret >= 0) >+ ret = r; >+ >+ r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, path, &d); >+ if (r >= 0) { >+ char *fn; >+ >+ while ((r = cg_read_subgroup(d, &fn)) > 0) { >+ _cleanup_free_ char *p = NULL; >+ >+ p = strjoin(path, "/", fn, NULL); >+ free(fn); >+ >+ if (!p) >+ return -ENOMEM; >+ >+ r = watch_pids_in_path(u, p); >+ if (r < 0 && ret >= 0) >+ ret = r; >+ } >+ if (r < 0 && ret >= 0) >+ ret = r; >+ >+ } else if (ret >= 0) >+ ret = r; >+ >+ return ret; >+} >+ >+ >+int unit_watch_all_pids(Unit *u) { >+ assert(u); >+ >+ if (!u->cgroup_path) >+ return -ENOENT; >+ >+ /* Adds all PIDs from our cgroup to the set of PIDs we watch */ >+ >+ return watch_pids_in_path(u, u->cgroup_path); >+} >+ >+void unit_unwatch_all_pids(Unit *u) { >+ Iterator i; >+ void *e; >+ >+ assert(u); >+ >+ SET_FOREACH(e, u->pids, i) >+ hashmap_remove_value(u->manager->watch_pids, e, u); >+ >+ set_free(u->pids); >+ u->pids = NULL; >+} >+ >+void unit_tidy_watch_pids(Unit *u, pid_t except1, pid_t except2) { >+ Iterator i; >+ void *e; >+ >+ assert(u); >+ >+ /* Cleans dead PIDs from our list */ >+ >+ SET_FOREACH(e, u->pids, i) { >+ pid_t pid = PTR_TO_LONG(e); >+ >+ if (pid == except1 || pid == except2) >+ continue; >+ >+ if (kill(pid, 0) < 0 && errno == ESRCH) >+ set_remove(u->pids, e); >+ } > } > > int unit_watch_timer(Unit *u, clockid_t clock_id, bool relative, usec_t usec, Watch *w) { >diff -Naur systemd-208.mod.bck/src/core/unit.c.orig systemd-208.mod/src/core/unit.c.orig >--- systemd-208.mod.bck/src/core/unit.c.orig 1970-01-01 01:00:00.000000000 +0100 >+++ systemd-208.mod/src/core/unit.c.orig 2015-01-26 11:25:19.000000000 +0100 >@@ -0,0 +1,3159 @@ >+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ >+ >+/*** >+ This file is part of systemd. >+ >+ Copyright 2010 Lennart Poettering >+ >+ systemd is free software; you can redistribute it and/or modify it >+ under the terms of the GNU Lesser General Public License as published by >+ the Free Software Foundation; either version 2.1 of the License, or >+ (at your option) any later version. >+ >+ systemd is distributed in the hope that it will be useful, but >+ WITHOUT ANY WARRANTY; without even the implied warranty of >+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ Lesser General Public License for more details. >+ >+ You should have received a copy of the GNU Lesser General Public License >+ along with systemd; If not, see <http://www.gnu.org/licenses/>. >+***/ >+ >+#include <assert.h> >+#include <errno.h> >+#include <string.h> >+#include <sys/epoll.h> >+#include <sys/timerfd.h> >+#include <sys/poll.h> >+#include <stdlib.h> >+#include <unistd.h> >+#include <sys/stat.h> >+ >+#include "systemd/sd-id128.h" >+#include "systemd/sd-messages.h" >+#include "set.h" >+#include "unit.h" >+#include "macro.h" >+#include "strv.h" >+#include "path-util.h" >+#include "load-fragment.h" >+#include "load-dropin.h" >+#include "log.h" >+#include "unit-name.h" >+#include "dbus-unit.h" >+#include "special.h" >+#include "cgroup-util.h" >+#include "missing.h" >+#include "mkdir.h" >+#include "label.h" >+#include "fileio-label.h" >+#include "bus-errors.h" >+ >+const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = { >+ [UNIT_SERVICE] = &service_vtable, >+ [UNIT_TIMER] = &timer_vtable, >+ [UNIT_SOCKET] = &socket_vtable, >+ [UNIT_TARGET] = &target_vtable, >+ [UNIT_DEVICE] = &device_vtable, >+ [UNIT_MOUNT] = &mount_vtable, >+ [UNIT_AUTOMOUNT] = &automount_vtable, >+ [UNIT_SNAPSHOT] = &snapshot_vtable, >+ [UNIT_SWAP] = &swap_vtable, >+ [UNIT_PATH] = &path_vtable, >+ [UNIT_SLICE] = &slice_vtable, >+ [UNIT_SCOPE] = &scope_vtable >+}; >+ >+Unit *unit_new(Manager *m, size_t size) { >+ Unit *u; >+ >+ assert(m); >+ assert(size >= sizeof(Unit)); >+ >+ u = malloc0(size); >+ if (!u) >+ return NULL; >+ >+ u->names = set_new(string_hash_func, string_compare_func); >+ if (!u->names) { >+ free(u); >+ return NULL; >+ } >+ >+ u->manager = m; >+ u->type = _UNIT_TYPE_INVALID; >+ u->deserialized_job = _JOB_TYPE_INVALID; >+ u->default_dependencies = true; >+ u->unit_file_state = _UNIT_FILE_STATE_INVALID; >+ >+ return u; >+} >+ >+bool unit_has_name(Unit *u, const char *name) { >+ assert(u); >+ assert(name); >+ >+ return !!set_get(u->names, (char*) name); >+} >+ >+int unit_add_name(Unit *u, const char *text) { >+ UnitType t; >+ char *s, *i = NULL; >+ int r; >+ >+ assert(u); >+ assert(text); >+ >+ if (unit_name_is_template(text)) { >+ if (!u->instance) >+ return -EINVAL; >+ >+ s = unit_name_replace_instance(text, u->instance); >+ } else >+ s = strdup(text); >+ >+ if (!s) >+ return -ENOMEM; >+ >+ if (!unit_name_is_valid(s, false)) { >+ r = -EINVAL; >+ goto fail; >+ } >+ >+ assert_se((t = unit_name_to_type(s)) >= 0); >+ >+ if (u->type != _UNIT_TYPE_INVALID && t != u->type) { >+ r = -EINVAL; >+ goto fail; >+ } >+ >+ if ((r = unit_name_to_instance(s, &i)) < 0) >+ goto fail; >+ >+ if (i && unit_vtable[t]->no_instances) { >+ r = -EINVAL; >+ goto fail; >+ } >+ >+ /* Ensure that this unit is either instanced or not instanced, >+ * but not both. */ >+ if (u->type != _UNIT_TYPE_INVALID && !u->instance != !i) { >+ r = -EINVAL; >+ goto fail; >+ } >+ >+ if (unit_vtable[t]->no_alias && >+ !set_isempty(u->names) && >+ !set_get(u->names, s)) { >+ r = -EEXIST; >+ goto fail; >+ } >+ >+ if (hashmap_size(u->manager->units) >= MANAGER_MAX_NAMES) { >+ r = -E2BIG; >+ goto fail; >+ } >+ >+ if ((r = set_put(u->names, s)) < 0) { >+ if (r == -EEXIST) >+ r = 0; >+ goto fail; >+ } >+ >+ if ((r = hashmap_put(u->manager->units, s, u)) < 0) { >+ set_remove(u->names, s); >+ goto fail; >+ } >+ >+ if (u->type == _UNIT_TYPE_INVALID) { >+ >+ u->type = t; >+ u->id = s; >+ u->instance = i; >+ >+ LIST_PREPEND(Unit, units_by_type, u->manager->units_by_type[t], u); >+ >+ if (UNIT_VTABLE(u)->init) >+ UNIT_VTABLE(u)->init(u); >+ } else >+ free(i); >+ >+ unit_add_to_dbus_queue(u); >+ return 0; >+ >+fail: >+ free(s); >+ free(i); >+ >+ return r; >+} >+ >+int unit_choose_id(Unit *u, const char *name) { >+ char *s, *i; >+ _cleanup_free_ char *t = NULL; >+ int r; >+ >+ assert(u); >+ assert(name); >+ >+ if (unit_name_is_template(name)) { >+ >+ if (!u->instance) >+ return -EINVAL; >+ >+ if (!(t = unit_name_replace_instance(name, u->instance))) >+ return -ENOMEM; >+ >+ name = t; >+ } >+ >+ /* Selects one of the names of this unit as the id */ >+ s = set_get(u->names, (char*) name); >+ >+ if (!s) >+ return -ENOENT; >+ >+ if ((r = unit_name_to_instance(s, &i)) < 0) >+ return r; >+ >+ u->id = s; >+ >+ free(u->instance); >+ u->instance = i; >+ >+ unit_add_to_dbus_queue(u); >+ >+ return 0; >+} >+ >+int unit_set_description(Unit *u, const char *description) { >+ char *s; >+ >+ assert(u); >+ >+ if (isempty(description)) >+ s = NULL; >+ else { >+ s = strdup(description); >+ if (!s) >+ return -ENOMEM; >+ } >+ >+ free(u->description); >+ u->description = s; >+ >+ unit_add_to_dbus_queue(u); >+ return 0; >+} >+ >+bool unit_check_gc(Unit *u) { >+ assert(u); >+ >+ if (u->load_state == UNIT_STUB) >+ return true; >+ >+ if (UNIT_VTABLE(u)->no_gc) >+ return true; >+ >+ if (u->no_gc) >+ return true; >+ >+ if (u->job) >+ return true; >+ >+ if (u->nop_job) >+ return true; >+ >+ if (unit_active_state(u) != UNIT_INACTIVE) >+ return true; >+ >+ if (u->refs) >+ return true; >+ >+ if (UNIT_VTABLE(u)->check_gc) >+ if (UNIT_VTABLE(u)->check_gc(u)) >+ return true; >+ >+ return false; >+} >+ >+void unit_add_to_load_queue(Unit *u) { >+ assert(u); >+ assert(u->type != _UNIT_TYPE_INVALID); >+ >+ if (u->load_state != UNIT_STUB || u->in_load_queue) >+ return; >+ >+ LIST_PREPEND(Unit, load_queue, u->manager->load_queue, u); >+ u->in_load_queue = true; >+} >+ >+void unit_add_to_cleanup_queue(Unit *u) { >+ assert(u); >+ >+ if (u->in_cleanup_queue) >+ return; >+ >+ LIST_PREPEND(Unit, cleanup_queue, u->manager->cleanup_queue, u); >+ u->in_cleanup_queue = true; >+} >+ >+void unit_add_to_gc_queue(Unit *u) { >+ assert(u); >+ >+ if (u->in_gc_queue || u->in_cleanup_queue) >+ return; >+ >+ if (unit_check_gc(u)) >+ return; >+ >+ LIST_PREPEND(Unit, gc_queue, u->manager->gc_queue, u); >+ u->in_gc_queue = true; >+ >+ u->manager->n_in_gc_queue ++; >+} >+ >+void unit_add_to_dbus_queue(Unit *u) { >+ assert(u); >+ assert(u->type != _UNIT_TYPE_INVALID); >+ >+ if (u->load_state == UNIT_STUB || u->in_dbus_queue) >+ return; >+ >+ /* Shortcut things if nobody cares */ >+ if (!bus_has_subscriber(u->manager)) { >+ u->sent_dbus_new_signal = true; >+ return; >+ } >+ >+ LIST_PREPEND(Unit, dbus_queue, u->manager->dbus_unit_queue, u); >+ u->in_dbus_queue = true; >+} >+ >+static void bidi_set_free(Unit *u, Set *s) { >+ Iterator i; >+ Unit *other; >+ >+ assert(u); >+ >+ /* Frees the set and makes sure we are dropped from the >+ * inverse pointers */ >+ >+ SET_FOREACH(other, s, i) { >+ UnitDependency d; >+ >+ for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++) >+ set_remove(other->dependencies[d], u); >+ >+ unit_add_to_gc_queue(other); >+ } >+ >+ set_free(s); >+} >+ >+static void unit_remove_transient(Unit *u) { >+ char **i; >+ >+ assert(u); >+ >+ if (!u->transient) >+ return; >+ >+ if (u->fragment_path) >+ unlink(u->fragment_path); >+ >+ STRV_FOREACH(i, u->dropin_paths) { >+ _cleanup_free_ char *p = NULL; >+ int r; >+ >+ unlink(*i); >+ >+ r = path_get_parent(*i, &p); >+ if (r >= 0) >+ rmdir(p); >+ } >+} >+ >+static void unit_free_requires_mounts_for(Unit *u) { >+ char **j; >+ >+ STRV_FOREACH(j, u->requires_mounts_for) { >+ char s[strlen(*j) + 1]; >+ >+ PATH_FOREACH_PREFIX_MORE(s, *j) { >+ char *y; >+ Set *x; >+ >+ x = hashmap_get2(u->manager->units_requiring_mounts_for, s, (void**) &y); >+ if (!x) >+ continue; >+ >+ set_remove(x, u); >+ >+ if (set_isempty(x)) { >+ hashmap_remove(u->manager->units_requiring_mounts_for, y); >+ free(y); >+ set_free(x); >+ } >+ } >+ } >+ >+ strv_free(u->requires_mounts_for); >+ u->requires_mounts_for = NULL; >+} >+ >+void unit_free(Unit *u) { >+ UnitDependency d; >+ Iterator i; >+ char *t; >+ >+ assert(u); >+ >+ if (u->manager->n_reloading <= 0) >+ unit_remove_transient(u); >+ >+ bus_unit_send_removed_signal(u); >+ >+ if (u->load_state != UNIT_STUB) >+ if (UNIT_VTABLE(u)->done) >+ UNIT_VTABLE(u)->done(u); >+ >+ unit_free_requires_mounts_for(u); >+ >+ SET_FOREACH(t, u->names, i) >+ hashmap_remove_value(u->manager->units, t, u); >+ >+ if (u->job) { >+ Job *j = u->job; >+ job_uninstall(j); >+ job_free(j); >+ } >+ >+ if (u->nop_job) { >+ Job *j = u->nop_job; >+ job_uninstall(j); >+ job_free(j); >+ } >+ >+ for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++) >+ bidi_set_free(u, u->dependencies[d]); >+ >+ if (u->type != _UNIT_TYPE_INVALID) >+ LIST_REMOVE(Unit, units_by_type, u->manager->units_by_type[u->type], u); >+ >+ if (u->in_load_queue) >+ LIST_REMOVE(Unit, load_queue, u->manager->load_queue, u); >+ >+ if (u->in_dbus_queue) >+ LIST_REMOVE(Unit, dbus_queue, u->manager->dbus_unit_queue, u); >+ >+ if (u->in_cleanup_queue) >+ LIST_REMOVE(Unit, cleanup_queue, u->manager->cleanup_queue, u); >+ >+ if (u->in_gc_queue) { >+ LIST_REMOVE(Unit, gc_queue, u->manager->gc_queue, u); >+ u->manager->n_in_gc_queue--; >+ } >+ >+ if (u->in_cgroup_queue) >+ LIST_REMOVE(Unit, cgroup_queue, u->manager->cgroup_queue, u); >+ >+ if (u->cgroup_path) { >+ hashmap_remove(u->manager->cgroup_unit, u->cgroup_path); >+ free(u->cgroup_path); >+ } >+ >+ free(u->description); >+ strv_free(u->documentation); >+ free(u->fragment_path); >+ free(u->source_path); >+ strv_free(u->dropin_paths); >+ free(u->instance); >+ >+ set_free_free(u->names); >+ >+ condition_free_list(u->conditions); >+ >+ unit_ref_unset(&u->slice); >+ >+ while (u->refs) >+ unit_ref_unset(u->refs); >+ >+ free(u); >+} >+ >+UnitActiveState unit_active_state(Unit *u) { >+ assert(u); >+ >+ if (u->load_state == UNIT_MERGED) >+ return unit_active_state(unit_follow_merge(u)); >+ >+ /* After a reload it might happen that a unit is not correctly >+ * loaded but still has a process around. That's why we won't >+ * shortcut failed loading to UNIT_INACTIVE_FAILED. */ >+ >+ return UNIT_VTABLE(u)->active_state(u); >+} >+ >+const char* unit_sub_state_to_string(Unit *u) { >+ assert(u); >+ >+ return UNIT_VTABLE(u)->sub_state_to_string(u); >+} >+ >+static void complete_move(Set **s, Set **other) { >+ assert(s); >+ assert(other); >+ >+ if (!*other) >+ return; >+ >+ if (*s) >+ set_move(*s, *other); >+ else { >+ *s = *other; >+ *other = NULL; >+ } >+} >+ >+static void merge_names(Unit *u, Unit *other) { >+ char *t; >+ Iterator i; >+ >+ assert(u); >+ assert(other); >+ >+ complete_move(&u->names, &other->names); >+ >+ set_free_free(other->names); >+ other->names = NULL; >+ other->id = NULL; >+ >+ SET_FOREACH(t, u->names, i) >+ assert_se(hashmap_replace(u->manager->units, t, u) == 0); >+} >+ >+static void merge_dependencies(Unit *u, Unit *other, UnitDependency d) { >+ Iterator i; >+ Unit *back; >+ int r; >+ >+ assert(u); >+ assert(other); >+ assert(d < _UNIT_DEPENDENCY_MAX); >+ >+ /* Fix backwards pointers */ >+ SET_FOREACH(back, other->dependencies[d], i) { >+ UnitDependency k; >+ >+ for (k = 0; k < _UNIT_DEPENDENCY_MAX; k++) >+ if ((r = set_remove_and_put(back->dependencies[k], other, u)) < 0) { >+ >+ if (r == -EEXIST) >+ set_remove(back->dependencies[k], other); >+ else >+ assert(r == -ENOENT); >+ } >+ } >+ >+ complete_move(&u->dependencies[d], &other->dependencies[d]); >+ >+ set_free(other->dependencies[d]); >+ other->dependencies[d] = NULL; >+} >+ >+int unit_merge(Unit *u, Unit *other) { >+ UnitDependency d; >+ >+ assert(u); >+ assert(other); >+ assert(u->manager == other->manager); >+ assert(u->type != _UNIT_TYPE_INVALID); >+ >+ other = unit_follow_merge(other); >+ >+ if (other == u) >+ return 0; >+ >+ if (u->type != other->type) >+ return -EINVAL; >+ >+ if (!u->instance != !other->instance) >+ return -EINVAL; >+ >+ if (other->load_state != UNIT_STUB && >+ other->load_state != UNIT_NOT_FOUND) >+ return -EEXIST; >+ >+ if (other->job) >+ return -EEXIST; >+ >+ if (other->nop_job) >+ return -EEXIST; >+ >+ if (!UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other))) >+ return -EEXIST; >+ >+ /* Merge names */ >+ merge_names(u, other); >+ >+ /* Redirect all references */ >+ while (other->refs) >+ unit_ref_set(other->refs, u); >+ >+ /* Merge dependencies */ >+ for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++) >+ merge_dependencies(u, other, d); >+ >+ other->load_state = UNIT_MERGED; >+ other->merged_into = u; >+ >+ /* If there is still some data attached to the other node, we >+ * don't need it anymore, and can free it. */ >+ if (other->load_state != UNIT_STUB) >+ if (UNIT_VTABLE(other)->done) >+ UNIT_VTABLE(other)->done(other); >+ >+ unit_add_to_dbus_queue(u); >+ unit_add_to_cleanup_queue(other); >+ >+ return 0; >+} >+ >+int unit_merge_by_name(Unit *u, const char *name) { >+ Unit *other; >+ int r; >+ _cleanup_free_ char *s = NULL; >+ >+ assert(u); >+ assert(name); >+ >+ if (unit_name_is_template(name)) { >+ if (!u->instance) >+ return -EINVAL; >+ >+ if (!(s = unit_name_replace_instance(name, u->instance))) >+ return -ENOMEM; >+ >+ name = s; >+ } >+ >+ other = manager_get_unit(u->manager, name); >+ if (!other) >+ r = unit_add_name(u, name); >+ else >+ r = unit_merge(u, other); >+ >+ return r; >+} >+ >+Unit* unit_follow_merge(Unit *u) { >+ assert(u); >+ >+ while (u->load_state == UNIT_MERGED) >+ assert_se(u = u->merged_into); >+ >+ return u; >+} >+ >+int unit_add_exec_dependencies(Unit *u, ExecContext *c) { >+ int r; >+ >+ assert(u); >+ assert(c); >+ >+ if (c->std_output != EXEC_OUTPUT_KMSG && >+ c->std_output != EXEC_OUTPUT_SYSLOG && >+ c->std_output != EXEC_OUTPUT_JOURNAL && >+ c->std_output != EXEC_OUTPUT_KMSG_AND_CONSOLE && >+ c->std_output != EXEC_OUTPUT_SYSLOG_AND_CONSOLE && >+ c->std_output != EXEC_OUTPUT_JOURNAL_AND_CONSOLE && >+ c->std_error != EXEC_OUTPUT_KMSG && >+ c->std_error != EXEC_OUTPUT_SYSLOG && >+ c->std_error != EXEC_OUTPUT_JOURNAL && >+ c->std_error != EXEC_OUTPUT_KMSG_AND_CONSOLE && >+ c->std_error != EXEC_OUTPUT_JOURNAL_AND_CONSOLE && >+ c->std_error != EXEC_OUTPUT_SYSLOG_AND_CONSOLE) >+ return 0; >+ >+ /* If syslog or kernel logging is requested, make sure our own >+ * logging daemon is run first. */ >+ >+ if (u->manager->running_as == SYSTEMD_SYSTEM) { >+ r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_JOURNALD_SOCKET, NULL, true); >+ if (r < 0) >+ return r; >+ } >+ >+ return 0; >+} >+ >+const char *unit_description(Unit *u) { >+ assert(u); >+ >+ if (u->description) >+ return u->description; >+ >+ return strna(u->id); >+} >+ >+void unit_dump(Unit *u, FILE *f, const char *prefix) { >+ char *t, **j; >+ UnitDependency d; >+ Iterator i; >+ _cleanup_free_ char *p2 = NULL; >+ const char *prefix2; >+ char >+ timestamp1[FORMAT_TIMESTAMP_MAX], >+ timestamp2[FORMAT_TIMESTAMP_MAX], >+ timestamp3[FORMAT_TIMESTAMP_MAX], >+ timestamp4[FORMAT_TIMESTAMP_MAX], >+ timespan[FORMAT_TIMESPAN_MAX]; >+ Unit *following; >+ >+ assert(u); >+ assert(u->type >= 0); >+ >+ if (!prefix) >+ prefix = ""; >+ p2 = strappend(prefix, "\t"); >+ prefix2 = p2 ? p2 : prefix; >+ >+ fprintf(f, >+ "%s-> Unit %s:\n" >+ "%s\tDescription: %s\n" >+ "%s\tInstance: %s\n" >+ "%s\tUnit Load State: %s\n" >+ "%s\tUnit Active State: %s\n" >+ "%s\tInactive Exit Timestamp: %s\n" >+ "%s\tActive Enter Timestamp: %s\n" >+ "%s\tActive Exit Timestamp: %s\n" >+ "%s\tInactive Enter Timestamp: %s\n" >+ "%s\tGC Check Good: %s\n" >+ "%s\tNeed Daemon Reload: %s\n" >+ "%s\tTransient: %s\n" >+ "%s\tSlice: %s\n" >+ "%s\tCGroup: %s\n" >+ "%s\tCGroup realized: %s\n" >+ "%s\tCGroup mask: 0x%x\n", >+ prefix, u->id, >+ prefix, unit_description(u), >+ prefix, strna(u->instance), >+ prefix, unit_load_state_to_string(u->load_state), >+ prefix, unit_active_state_to_string(unit_active_state(u)), >+ prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->inactive_exit_timestamp.realtime)), >+ prefix, strna(format_timestamp(timestamp2, sizeof(timestamp2), u->active_enter_timestamp.realtime)), >+ prefix, strna(format_timestamp(timestamp3, sizeof(timestamp3), u->active_exit_timestamp.realtime)), >+ prefix, strna(format_timestamp(timestamp4, sizeof(timestamp4), u->inactive_enter_timestamp.realtime)), >+ prefix, yes_no(unit_check_gc(u)), >+ prefix, yes_no(unit_need_daemon_reload(u)), >+ prefix, yes_no(u->transient), >+ prefix, strna(unit_slice_name(u)), >+ prefix, strna(u->cgroup_path), >+ prefix, yes_no(u->cgroup_realized), >+ prefix, u->cgroup_mask); >+ >+ SET_FOREACH(t, u->names, i) >+ fprintf(f, "%s\tName: %s\n", prefix, t); >+ >+ STRV_FOREACH(j, u->documentation) >+ fprintf(f, "%s\tDocumentation: %s\n", prefix, *j); >+ >+ if ((following = unit_following(u))) >+ fprintf(f, "%s\tFollowing: %s\n", prefix, following->id); >+ >+ if (u->fragment_path) >+ fprintf(f, "%s\tFragment Path: %s\n", prefix, u->fragment_path); >+ >+ if (u->source_path) >+ fprintf(f, "%s\tSource Path: %s\n", prefix, u->source_path); >+ >+ STRV_FOREACH(j, u->dropin_paths) >+ fprintf(f, "%s\tDropIn Path: %s\n", prefix, *j); >+ >+ if (u->job_timeout > 0) >+ fprintf(f, "%s\tJob Timeout: %s\n", prefix, format_timespan(timespan, sizeof(timespan), u->job_timeout, 0)); >+ >+ condition_dump_list(u->conditions, f, prefix); >+ >+ if (dual_timestamp_is_set(&u->condition_timestamp)) >+ fprintf(f, >+ "%s\tCondition Timestamp: %s\n" >+ "%s\tCondition Result: %s\n", >+ prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->condition_timestamp.realtime)), >+ prefix, yes_no(u->condition_result)); >+ >+ for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++) { >+ Unit *other; >+ >+ SET_FOREACH(other, u->dependencies[d], i) >+ fprintf(f, "%s\t%s: %s\n", prefix, unit_dependency_to_string(d), other->id); >+ } >+ >+ if (!strv_isempty(u->requires_mounts_for)) { >+ fprintf(f, >+ "%s\tRequiresMountsFor:", prefix); >+ >+ STRV_FOREACH(j, u->requires_mounts_for) >+ fprintf(f, " %s", *j); >+ >+ fputs("\n", f); >+ } >+ >+ if (u->load_state == UNIT_LOADED) { >+ >+ fprintf(f, >+ "%s\tStopWhenUnneeded: %s\n" >+ "%s\tRefuseManualStart: %s\n" >+ "%s\tRefuseManualStop: %s\n" >+ "%s\tDefaultDependencies: %s\n" >+ "%s\tOnFailureIsolate: %s\n" >+ "%s\tIgnoreOnIsolate: %s\n" >+ "%s\tIgnoreOnSnapshot: %s\n", >+ prefix, yes_no(u->stop_when_unneeded), >+ prefix, yes_no(u->refuse_manual_start), >+ prefix, yes_no(u->refuse_manual_stop), >+ prefix, yes_no(u->default_dependencies), >+ prefix, yes_no(u->on_failure_isolate), >+ prefix, yes_no(u->ignore_on_isolate), >+ prefix, yes_no(u->ignore_on_snapshot)); >+ >+ if (UNIT_VTABLE(u)->dump) >+ UNIT_VTABLE(u)->dump(u, f, prefix2); >+ >+ } else if (u->load_state == UNIT_MERGED) >+ fprintf(f, >+ "%s\tMerged into: %s\n", >+ prefix, u->merged_into->id); >+ else if (u->load_state == UNIT_ERROR) >+ fprintf(f, "%s\tLoad Error Code: %s\n", prefix, strerror(-u->load_error)); >+ >+ >+ if (u->job) >+ job_dump(u->job, f, prefix2); >+ >+ if (u->nop_job) >+ job_dump(u->nop_job, f, prefix2); >+ >+} >+ >+/* Common implementation for multiple backends */ >+int unit_load_fragment_and_dropin(Unit *u) { >+ int r; >+ >+ assert(u); >+ >+ /* Load a .service file */ >+ r = unit_load_fragment(u); >+ if (r < 0) >+ return r; >+ >+ if (u->load_state == UNIT_STUB) >+ return -ENOENT; >+ >+ /* Load drop-in directory data */ >+ r = unit_load_dropin(unit_follow_merge(u)); >+ if (r < 0) >+ return r; >+ >+ return 0; >+} >+ >+/* Common implementation for multiple backends */ >+int unit_load_fragment_and_dropin_optional(Unit *u) { >+ int r; >+ >+ assert(u); >+ >+ /* Same as unit_load_fragment_and_dropin(), but whether >+ * something can be loaded or not doesn't matter. */ >+ >+ /* Load a .service file */ >+ r = unit_load_fragment(u); >+ if (r < 0) >+ return r; >+ >+ if (u->load_state == UNIT_STUB) >+ u->load_state = UNIT_LOADED; >+ >+ /* Load drop-in directory data */ >+ r = unit_load_dropin(unit_follow_merge(u)); >+ if (r < 0) >+ return r; >+ >+ return 0; >+} >+ >+int unit_add_default_target_dependency(Unit *u, Unit *target) { >+ assert(u); >+ assert(target); >+ >+ if (target->type != UNIT_TARGET) >+ return 0; >+ >+ /* Only add the dependency if both units are loaded, so that >+ * that loop check below is reliable */ >+ if (u->load_state != UNIT_LOADED || >+ target->load_state != UNIT_LOADED) >+ return 0; >+ >+ /* If either side wants no automatic dependencies, then let's >+ * skip this */ >+ if (!u->default_dependencies || >+ !target->default_dependencies) >+ return 0; >+ >+ /* Don't create loops */ >+ if (set_get(target->dependencies[UNIT_BEFORE], u)) >+ return 0; >+ >+ return unit_add_dependency(target, UNIT_AFTER, u, true); >+} >+ >+static int unit_add_default_dependencies(Unit *u) { >+ >+ static const UnitDependency deps[] = { >+ UNIT_REQUIRED_BY, >+ UNIT_REQUIRED_BY_OVERRIDABLE, >+ UNIT_WANTED_BY, >+ UNIT_BOUND_BY >+ }; >+ >+ Unit *target; >+ Iterator i; >+ int r; >+ unsigned k; >+ >+ assert(u); >+ >+ for (k = 0; k < ELEMENTSOF(deps); k++) >+ SET_FOREACH(target, u->dependencies[deps[k]], i) { >+ r = unit_add_default_target_dependency(u, target); >+ if (r < 0) >+ return r; >+ } >+ >+ if (u->default_dependencies && unit_get_cgroup_context(u)) { >+ if (UNIT_ISSET(u->slice)) >+ r = unit_add_two_dependencies(u, UNIT_AFTER, UNIT_WANTS, UNIT_DEREF(u->slice), true); >+ else >+ r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_WANTS, SPECIAL_ROOT_SLICE, NULL, true); >+ >+ if (r < 0) >+ return r; >+ } >+ >+ return 0; >+} >+ >+int unit_load(Unit *u) { >+ int r; >+ >+ assert(u); >+ >+ if (u->in_load_queue) { >+ LIST_REMOVE(Unit, load_queue, u->manager->load_queue, u); >+ u->in_load_queue = false; >+ } >+ >+ if (u->type == _UNIT_TYPE_INVALID) >+ return -EINVAL; >+ >+ if (u->load_state != UNIT_STUB) >+ return 0; >+ >+ if (UNIT_VTABLE(u)->load) { >+ r = UNIT_VTABLE(u)->load(u); >+ if (r < 0) >+ goto fail; >+ } >+ >+ if (u->load_state == UNIT_STUB) { >+ r = -ENOENT; >+ goto fail; >+ } >+ >+ if (u->load_state == UNIT_LOADED) { >+ >+ if (u->default_dependencies) { >+ r = unit_add_default_dependencies(u); >+ if (r < 0) >+ goto fail; >+ } >+ >+ r = unit_add_mount_links(u); >+ if (r < 0) >+ goto fail; >+ >+ if (u->on_failure_isolate && >+ set_size(u->dependencies[UNIT_ON_FAILURE]) > 1) { >+ >+ log_error_unit(u->id, >+ "More than one OnFailure= dependencies specified for %s but OnFailureIsolate= enabled. Refusing.", u->id); >+ >+ r = -EINVAL; >+ goto fail; >+ } >+ } >+ >+ assert((u->load_state != UNIT_MERGED) == !u->merged_into); >+ >+ unit_add_to_dbus_queue(unit_follow_merge(u)); >+ unit_add_to_gc_queue(u); >+ >+ return 0; >+ >+fail: >+ u->load_state = u->load_state == UNIT_STUB ? UNIT_NOT_FOUND : UNIT_ERROR; >+ u->load_error = r; >+ unit_add_to_dbus_queue(u); >+ unit_add_to_gc_queue(u); >+ >+ log_debug_unit(u->id, "Failed to load configuration for %s: %s", >+ u->id, strerror(-r)); >+ >+ return r; >+} >+ >+bool unit_condition_test(Unit *u) { >+ assert(u); >+ >+ dual_timestamp_get(&u->condition_timestamp); >+ u->condition_result = condition_test_list(u->id, u->conditions); >+ >+ return u->condition_result; >+} >+ >+_pure_ static const char* unit_get_status_message_format(Unit *u, JobType t) { >+ const UnitStatusMessageFormats *format_table; >+ >+ assert(u); >+ assert(t >= 0); >+ assert(t < _JOB_TYPE_MAX); >+ >+ if (t != JOB_START && t != JOB_STOP) >+ return NULL; >+ >+ format_table = &UNIT_VTABLE(u)->status_message_formats; >+ if (!format_table) >+ return NULL; >+ >+ return format_table->starting_stopping[t == JOB_STOP]; >+} >+ >+_pure_ static const char *unit_get_status_message_format_try_harder(Unit *u, JobType t) { >+ const char *format; >+ >+ assert(u); >+ assert(t >= 0); >+ assert(t < _JOB_TYPE_MAX); >+ >+ format = unit_get_status_message_format(u, t); >+ if (format) >+ return format; >+ >+ /* Return generic strings */ >+ if (t == JOB_START) >+ return "Starting %s."; >+ else if (t == JOB_STOP) >+ return "Stopping %s."; >+ else if (t == JOB_RELOAD) >+ return "Reloading %s."; >+ >+ return NULL; >+} >+ >+static void unit_status_print_starting_stopping(Unit *u, JobType t) { >+ const char *format; >+ >+ assert(u); >+ >+ /* We only print status messages for selected units on >+ * selected operations. */ >+ >+ format = unit_get_status_message_format(u, t); >+ if (!format) >+ return; >+ >+ unit_status_printf(u, "", format); >+} >+ >+#pragma GCC diagnostic push >+#pragma GCC diagnostic ignored "-Wformat-nonliteral" >+static void unit_status_log_starting_stopping_reloading(Unit *u, JobType t) { >+ const char *format; >+ char buf[LINE_MAX]; >+ sd_id128_t mid; >+ >+ assert(u); >+ >+ if (t != JOB_START && t != JOB_STOP && t != JOB_RELOAD) >+ return; >+ >+ if (log_on_console()) >+ return; >+ >+ /* We log status messages for all units and all operations. */ >+ >+ format = unit_get_status_message_format_try_harder(u, t); >+ if (!format) >+ return; >+ >+ snprintf(buf, sizeof(buf), format, unit_description(u)); >+ char_array_0(buf); >+ >+ mid = t == JOB_START ? SD_MESSAGE_UNIT_STARTING : >+ t == JOB_STOP ? SD_MESSAGE_UNIT_STOPPING : >+ SD_MESSAGE_UNIT_RELOADING; >+ >+ log_struct_unit(LOG_INFO, >+ u->id, >+ MESSAGE_ID(mid), >+ "MESSAGE=%s", buf, >+ NULL); >+} >+#pragma GCC diagnostic pop >+ >+/* Errors: >+ * -EBADR: This unit type does not support starting. >+ * -EALREADY: Unit is already started. >+ * -EAGAIN: An operation is already in progress. Retry later. >+ * -ECANCELED: Too many requests for now. >+ */ >+int unit_start(Unit *u) { >+ UnitActiveState state; >+ Unit *following; >+ >+ assert(u); >+ >+ if (u->load_state != UNIT_LOADED) >+ return -EINVAL; >+ >+ /* If this is already started, then this will succeed. Note >+ * that this will even succeed if this unit is not startable >+ * by the user. This is relied on to detect when we need to >+ * wait for units and when waiting is finished. */ >+ state = unit_active_state(u); >+ if (UNIT_IS_ACTIVE_OR_RELOADING(state)) >+ return -EALREADY; >+ >+ /* If the conditions failed, don't do anything at all. If we >+ * already are activating this call might still be useful to >+ * speed up activation in case there is some hold-off time, >+ * but we don't want to recheck the condition in that case. */ >+ if (state != UNIT_ACTIVATING && >+ !unit_condition_test(u)) { >+ log_debug_unit(u->id, "Starting of %s requested but condition failed. Ignoring.", u->id); >+ return -EALREADY; >+ } >+ >+ /* Forward to the main object, if we aren't it. */ >+ following = unit_following(u); >+ if (following) { >+ log_debug_unit(u->id, "Redirecting start request from %s to %s.", >+ u->id, following->id); >+ return unit_start(following); >+ } >+ >+ unit_status_log_starting_stopping_reloading(u, JOB_START); >+ unit_status_print_starting_stopping(u, JOB_START); >+ >+ /* If it is stopped, but we cannot start it, then fail */ >+ if (!UNIT_VTABLE(u)->start) >+ return -EBADR; >+ >+ /* We don't suppress calls to ->start() here when we are >+ * already starting, to allow this request to be used as a >+ * "hurry up" call, for example when the unit is in some "auto >+ * restart" state where it waits for a holdoff timer to elapse >+ * before it will start again. */ >+ >+ unit_add_to_dbus_queue(u); >+ >+ return UNIT_VTABLE(u)->start(u); >+} >+ >+bool unit_can_start(Unit *u) { >+ assert(u); >+ >+ return !!UNIT_VTABLE(u)->start; >+} >+ >+bool unit_can_isolate(Unit *u) { >+ assert(u); >+ >+ return unit_can_start(u) && >+ u->allow_isolate; >+} >+ >+/* Errors: >+ * -EBADR: This unit type does not support stopping. >+ * -EALREADY: Unit is already stopped. >+ * -EAGAIN: An operation is already in progress. Retry later. >+ */ >+int unit_stop(Unit *u) { >+ UnitActiveState state; >+ Unit *following; >+ >+ assert(u); >+ >+ state = unit_active_state(u); >+ if (UNIT_IS_INACTIVE_OR_FAILED(state)) >+ return -EALREADY; >+ >+ if ((following = unit_following(u))) { >+ log_debug_unit(u->id, "Redirecting stop request from %s to %s.", >+ u->id, following->id); >+ return unit_stop(following); >+ } >+ >+ unit_status_log_starting_stopping_reloading(u, JOB_STOP); >+ unit_status_print_starting_stopping(u, JOB_STOP); >+ >+ if (!UNIT_VTABLE(u)->stop) >+ return -EBADR; >+ >+ unit_add_to_dbus_queue(u); >+ >+ return UNIT_VTABLE(u)->stop(u); >+} >+ >+/* Errors: >+ * -EBADR: This unit type does not support reloading. >+ * -ENOEXEC: Unit is not started. >+ * -EAGAIN: An operation is already in progress. Retry later. >+ */ >+int unit_reload(Unit *u) { >+ UnitActiveState state; >+ Unit *following; >+ >+ assert(u); >+ >+ if (u->load_state != UNIT_LOADED) >+ return -EINVAL; >+ >+ if (!unit_can_reload(u)) >+ return -EBADR; >+ >+ state = unit_active_state(u); >+ if (state == UNIT_RELOADING) >+ return -EALREADY; >+ >+ if (state != UNIT_ACTIVE) >+ return -ENOEXEC; >+ >+ if ((following = unit_following(u))) { >+ log_debug_unit(u->id, "Redirecting reload request from %s to %s.", >+ u->id, following->id); >+ return unit_reload(following); >+ } >+ >+ unit_status_log_starting_stopping_reloading(u, JOB_RELOAD); >+ >+ unit_add_to_dbus_queue(u); >+ return UNIT_VTABLE(u)->reload(u); >+} >+ >+bool unit_can_reload(Unit *u) { >+ assert(u); >+ >+ if (!UNIT_VTABLE(u)->reload) >+ return false; >+ >+ if (!UNIT_VTABLE(u)->can_reload) >+ return true; >+ >+ return UNIT_VTABLE(u)->can_reload(u); >+} >+ >+static void unit_check_unneeded(Unit *u) { >+ Iterator i; >+ Unit *other; >+ >+ assert(u); >+ >+ /* If this service shall be shut down when unneeded then do >+ * so. */ >+ >+ if (!u->stop_when_unneeded) >+ return; >+ >+ if (!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u))) >+ return; >+ >+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRED_BY], i) >+ if (unit_active_or_pending(other)) >+ return; >+ >+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRED_BY_OVERRIDABLE], i) >+ if (unit_active_or_pending(other)) >+ return; >+ >+ SET_FOREACH(other, u->dependencies[UNIT_WANTED_BY], i) >+ if (unit_active_or_pending(other)) >+ return; >+ >+ SET_FOREACH(other, u->dependencies[UNIT_BOUND_BY], i) >+ if (unit_active_or_pending(other)) >+ return; >+ >+ log_info_unit(u->id, "Service %s is not needed anymore. Stopping.", u->id); >+ >+ /* Ok, nobody needs us anymore. Sniff. Then let's commit suicide */ >+ manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, true, NULL, NULL); >+} >+ >+static void retroactively_start_dependencies(Unit *u) { >+ Iterator i; >+ Unit *other; >+ >+ assert(u); >+ assert(UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u))); >+ >+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRES], i) >+ if (!set_get(u->dependencies[UNIT_AFTER], other) && >+ !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other))) >+ manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL); >+ >+ SET_FOREACH(other, u->dependencies[UNIT_BINDS_TO], i) >+ if (!set_get(u->dependencies[UNIT_AFTER], other) && >+ !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other))) >+ manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL); >+ >+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRES_OVERRIDABLE], i) >+ if (!set_get(u->dependencies[UNIT_AFTER], other) && >+ !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other))) >+ manager_add_job(u->manager, JOB_START, other, JOB_FAIL, false, NULL, NULL); >+ >+ SET_FOREACH(other, u->dependencies[UNIT_WANTS], i) >+ if (!set_get(u->dependencies[UNIT_AFTER], other) && >+ !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other))) >+ manager_add_job(u->manager, JOB_START, other, JOB_FAIL, false, NULL, NULL); >+ >+ SET_FOREACH(other, u->dependencies[UNIT_CONFLICTS], i) >+ if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) >+ manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL); >+ >+ SET_FOREACH(other, u->dependencies[UNIT_CONFLICTED_BY], i) >+ if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) >+ manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL); >+} >+ >+static void retroactively_stop_dependencies(Unit *u) { >+ Iterator i; >+ Unit *other; >+ >+ assert(u); >+ assert(UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u))); >+ >+ /* Pull down units which are bound to us recursively if enabled */ >+ SET_FOREACH(other, u->dependencies[UNIT_BOUND_BY], i) >+ if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) >+ manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL); >+} >+ >+static void check_unneeded_dependencies(Unit *u) { >+ Iterator i; >+ Unit *other; >+ >+ assert(u); >+ assert(UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u))); >+ >+ /* Garbage collect services that might not be needed anymore, if enabled */ >+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRES], i) >+ if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) >+ unit_check_unneeded(other); >+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRES_OVERRIDABLE], i) >+ if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) >+ unit_check_unneeded(other); >+ SET_FOREACH(other, u->dependencies[UNIT_WANTS], i) >+ if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) >+ unit_check_unneeded(other); >+ SET_FOREACH(other, u->dependencies[UNIT_REQUISITE], i) >+ if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) >+ unit_check_unneeded(other); >+ SET_FOREACH(other, u->dependencies[UNIT_REQUISITE_OVERRIDABLE], i) >+ if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) >+ unit_check_unneeded(other); >+ SET_FOREACH(other, u->dependencies[UNIT_BINDS_TO], i) >+ if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) >+ unit_check_unneeded(other); >+} >+ >+void unit_start_on_failure(Unit *u) { >+ Unit *other; >+ Iterator i; >+ >+ assert(u); >+ >+ if (set_size(u->dependencies[UNIT_ON_FAILURE]) <= 0) >+ return; >+ >+ log_info_unit(u->id, "Triggering OnFailure= dependencies of %s.", u->id); >+ >+ SET_FOREACH(other, u->dependencies[UNIT_ON_FAILURE], i) { >+ int r; >+ >+ r = manager_add_job(u->manager, JOB_START, other, u->on_failure_isolate ? JOB_ISOLATE : JOB_REPLACE, true, NULL, NULL); >+ if (r < 0) >+ log_error_unit(u->id, "Failed to enqueue OnFailure= job: %s", strerror(-r)); >+ } >+} >+ >+void unit_trigger_notify(Unit *u) { >+ Unit *other; >+ Iterator i; >+ >+ assert(u); >+ >+ SET_FOREACH(other, u->dependencies[UNIT_TRIGGERED_BY], i) >+ if (UNIT_VTABLE(other)->trigger_notify) >+ UNIT_VTABLE(other)->trigger_notify(other, u); >+} >+ >+void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_success) { >+ Manager *m; >+ bool unexpected; >+ >+ assert(u); >+ assert(os < _UNIT_ACTIVE_STATE_MAX); >+ assert(ns < _UNIT_ACTIVE_STATE_MAX); >+ >+ /* Note that this is called for all low-level state changes, >+ * even if they might map to the same high-level >+ * UnitActiveState! That means that ns == os is OK an expected >+ * behavior here. For example: if a mount point is remounted >+ * this function will be called too! */ >+ >+ m = u->manager; >+ >+ if (m->n_reloading <= 0) { >+ dual_timestamp ts; >+ >+ dual_timestamp_get(&ts); >+ >+ if (UNIT_IS_INACTIVE_OR_FAILED(os) && !UNIT_IS_INACTIVE_OR_FAILED(ns)) >+ u->inactive_exit_timestamp = ts; >+ else if (!UNIT_IS_INACTIVE_OR_FAILED(os) && UNIT_IS_INACTIVE_OR_FAILED(ns)) >+ u->inactive_enter_timestamp = ts; >+ >+ if (!UNIT_IS_ACTIVE_OR_RELOADING(os) && UNIT_IS_ACTIVE_OR_RELOADING(ns)) >+ u->active_enter_timestamp = ts; >+ else if (UNIT_IS_ACTIVE_OR_RELOADING(os) && !UNIT_IS_ACTIVE_OR_RELOADING(ns)) >+ u->active_exit_timestamp = ts; >+ } >+ >+ if (UNIT_IS_INACTIVE_OR_FAILED(ns)) >+ unit_destroy_cgroup(u); >+ >+ if (UNIT_IS_INACTIVE_OR_FAILED(os) != UNIT_IS_INACTIVE_OR_FAILED(ns)) { >+ ExecContext *ec = unit_get_exec_context(u); >+ if (ec && exec_context_may_touch_console(ec)) { >+ if (UNIT_IS_INACTIVE_OR_FAILED(ns)) { >+ m->n_on_console --; >+ >+ if (m->n_on_console == 0) >+ /* unset no_console_output flag, since the console is free */ >+ m->no_console_output = 0; >+ } else >+ m->n_on_console ++; >+ } >+ } >+ >+ if (u->job) { >+ unexpected = false; >+ >+ if (u->job->state == JOB_WAITING) >+ >+ /* So we reached a different state for this >+ * job. Let's see if we can run it now if it >+ * failed previously due to EAGAIN. */ >+ job_add_to_run_queue(u->job); >+ >+ /* Let's check whether this state change constitutes a >+ * finished job, or maybe contradicts a running job and >+ * hence needs to invalidate jobs. */ >+ >+ switch (u->job->type) { >+ >+ case JOB_START: >+ case JOB_VERIFY_ACTIVE: >+ >+ if (UNIT_IS_ACTIVE_OR_RELOADING(ns)) >+ job_finish_and_invalidate(u->job, JOB_DONE, true); >+ else if (u->job->state == JOB_RUNNING && ns != UNIT_ACTIVATING) { >+ unexpected = true; >+ >+ if (UNIT_IS_INACTIVE_OR_FAILED(ns)) >+ job_finish_and_invalidate(u->job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE, true); >+ } >+ >+ break; >+ >+ case JOB_RELOAD: >+ case JOB_RELOAD_OR_START: >+ >+ if (u->job->state == JOB_RUNNING) { >+ if (ns == UNIT_ACTIVE) >+ job_finish_and_invalidate(u->job, reload_success ? JOB_DONE : JOB_FAILED, true); >+ else if (ns != UNIT_ACTIVATING && ns != UNIT_RELOADING) { >+ unexpected = true; >+ >+ if (UNIT_IS_INACTIVE_OR_FAILED(ns)) >+ job_finish_and_invalidate(u->job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE, true); >+ } >+ } >+ >+ break; >+ >+ case JOB_STOP: >+ case JOB_RESTART: >+ case JOB_TRY_RESTART: >+ >+ if (UNIT_IS_INACTIVE_OR_FAILED(ns)) >+ job_finish_and_invalidate(u->job, JOB_DONE, true); >+ else if (u->job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) { >+ unexpected = true; >+ job_finish_and_invalidate(u->job, JOB_FAILED, true); >+ } >+ >+ break; >+ >+ default: >+ assert_not_reached("Job type unknown"); >+ } >+ >+ } else >+ unexpected = true; >+ >+ if (m->n_reloading <= 0) { >+ >+ /* If this state change happened without being >+ * requested by a job, then let's retroactively start >+ * or stop dependencies. We skip that step when >+ * deserializing, since we don't want to create any >+ * additional jobs just because something is already >+ * activated. */ >+ >+ if (unexpected) { >+ if (UNIT_IS_INACTIVE_OR_FAILED(os) && UNIT_IS_ACTIVE_OR_ACTIVATING(ns)) >+ retroactively_start_dependencies(u); >+ else if (UNIT_IS_ACTIVE_OR_ACTIVATING(os) && UNIT_IS_INACTIVE_OR_DEACTIVATING(ns)) >+ retroactively_stop_dependencies(u); >+ } >+ >+ /* stop unneeded units regardless if going down was expected or not */ >+ if (UNIT_IS_ACTIVE_OR_ACTIVATING(os) && UNIT_IS_INACTIVE_OR_DEACTIVATING(ns)) >+ check_unneeded_dependencies(u); >+ >+ if (ns != os && ns == UNIT_FAILED) { >+ log_notice_unit(u->id, >+ "Unit %s entered failed state.", u->id); >+ unit_start_on_failure(u); >+ } >+ } >+ >+ /* Some names are special */ >+ if (UNIT_IS_ACTIVE_OR_RELOADING(ns)) { >+ >+ if (unit_has_name(u, SPECIAL_DBUS_SERVICE)) >+ /* The bus just might have become available, >+ * hence try to connect to it, if we aren't >+ * yet connected. */ >+ bus_init(m, true); >+ >+ if (u->type == UNIT_SERVICE && >+ !UNIT_IS_ACTIVE_OR_RELOADING(os) && >+ m->n_reloading <= 0) { >+ /* Write audit record if we have just finished starting up */ >+ manager_send_unit_audit(m, u, AUDIT_SERVICE_START, true); >+ u->in_audit = true; >+ } >+ >+ if (!UNIT_IS_ACTIVE_OR_RELOADING(os)) >+ manager_send_unit_plymouth(m, u); >+ >+ } else { >+ >+ /* We don't care about D-Bus here, since we'll get an >+ * asynchronous notification for it anyway. */ >+ >+ if (u->type == UNIT_SERVICE && >+ UNIT_IS_INACTIVE_OR_FAILED(ns) && >+ !UNIT_IS_INACTIVE_OR_FAILED(os) && >+ m->n_reloading <= 0) { >+ >+ /* Hmm, if there was no start record written >+ * write it now, so that we always have a nice >+ * pair */ >+ if (!u->in_audit) { >+ manager_send_unit_audit(m, u, AUDIT_SERVICE_START, ns == UNIT_INACTIVE); >+ >+ if (ns == UNIT_INACTIVE) >+ manager_send_unit_audit(m, u, AUDIT_SERVICE_STOP, true); >+ } else >+ /* Write audit record if we have just finished shutting down */ >+ manager_send_unit_audit(m, u, AUDIT_SERVICE_STOP, ns == UNIT_INACTIVE); >+ >+ u->in_audit = false; >+ } >+ } >+ >+ manager_recheck_journal(m); >+ unit_trigger_notify(u); >+ >+ /* Maybe we finished startup and are now ready for being >+ * stopped because unneeded? */ >+ if (u->manager->n_reloading <= 0) >+ unit_check_unneeded(u); >+ >+ unit_add_to_dbus_queue(u); >+ unit_add_to_gc_queue(u); >+} >+ >+int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w) { >+ struct epoll_event ev = { >+ .data.ptr = w, >+ .events = events, >+ }; >+ >+ assert(u); >+ assert(fd >= 0); >+ assert(w); >+ assert(w->type == WATCH_INVALID || (w->type == WATCH_FD && w->fd == fd && w->data.unit == u)); >+ >+ if (epoll_ctl(u->manager->epoll_fd, >+ w->type == WATCH_INVALID ? EPOLL_CTL_ADD : EPOLL_CTL_MOD, >+ fd, >+ &ev) < 0) >+ return -errno; >+ >+ w->fd = fd; >+ w->type = WATCH_FD; >+ w->data.unit = u; >+ >+ return 0; >+} >+ >+void unit_unwatch_fd(Unit *u, Watch *w) { >+ assert(u); >+ assert(w); >+ >+ if (w->type == WATCH_INVALID) >+ return; >+ >+ assert(w->type == WATCH_FD); >+ assert(w->data.unit == u); >+ assert_se(epoll_ctl(u->manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0); >+ >+ w->fd = -1; >+ w->type = WATCH_INVALID; >+ w->data.unit = NULL; >+} >+ >+int unit_watch_pid(Unit *u, pid_t pid) { >+ assert(u); >+ assert(pid >= 1); >+ >+ /* Watch a specific PID. We only support one unit watching >+ * each PID for now. */ >+ >+ return hashmap_put(u->manager->watch_pids, LONG_TO_PTR(pid), u); >+} >+ >+void unit_unwatch_pid(Unit *u, pid_t pid) { >+ assert(u); >+ assert(pid >= 1); >+ >+ hashmap_remove_value(u->manager->watch_pids, LONG_TO_PTR(pid), u); >+} >+ >+int unit_watch_timer(Unit *u, clockid_t clock_id, bool relative, usec_t usec, Watch *w) { >+ struct itimerspec its = {}; >+ int flags, fd; >+ bool ours; >+ >+ assert(u); >+ assert(w); >+ assert(w->type == WATCH_INVALID || (w->type == WATCH_UNIT_TIMER && w->data.unit == u)); >+ >+ /* This will try to reuse the old timer if there is one */ >+ >+ if (w->type == WATCH_UNIT_TIMER) { >+ assert(w->data.unit == u); >+ assert(w->fd >= 0); >+ >+ ours = false; >+ fd = w->fd; >+ } else if (w->type == WATCH_INVALID) { >+ >+ ours = true; >+ fd = timerfd_create(clock_id, TFD_NONBLOCK|TFD_CLOEXEC); >+ if (fd < 0) >+ return -errno; >+ } else >+ assert_not_reached("Invalid watch type"); >+ >+ if (usec <= 0) { >+ /* Set absolute time in the past, but not 0, since we >+ * don't want to disarm the timer */ >+ its.it_value.tv_sec = 0; >+ its.it_value.tv_nsec = 1; >+ >+ flags = TFD_TIMER_ABSTIME; >+ } else { >+ timespec_store(&its.it_value, usec); >+ flags = relative ? 0 : TFD_TIMER_ABSTIME; >+ } >+ >+ /* This will also flush the elapse counter */ >+ if (timerfd_settime(fd, flags, &its, NULL) < 0) >+ goto fail; >+ >+ if (w->type == WATCH_INVALID) { >+ struct epoll_event ev = { >+ .data.ptr = w, >+ .events = EPOLLIN, >+ }; >+ >+ if (epoll_ctl(u->manager->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) >+ goto fail; >+ } >+ >+ w->type = WATCH_UNIT_TIMER; >+ w->fd = fd; >+ w->data.unit = u; >+ >+ return 0; >+ >+fail: >+ if (ours) >+ close_nointr_nofail(fd); >+ >+ return -errno; >+} >+ >+void unit_unwatch_timer(Unit *u, Watch *w) { >+ assert(u); >+ assert(w); >+ >+ if (w->type == WATCH_INVALID) >+ return; >+ >+ assert(w->type == WATCH_UNIT_TIMER); >+ assert(w->data.unit == u); >+ assert(w->fd >= 0); >+ >+ assert_se(epoll_ctl(u->manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0); >+ close_nointr_nofail(w->fd); >+ >+ w->fd = -1; >+ w->type = WATCH_INVALID; >+ w->data.unit = NULL; >+} >+ >+bool unit_job_is_applicable(Unit *u, JobType j) { >+ assert(u); >+ assert(j >= 0 && j < _JOB_TYPE_MAX); >+ >+ switch (j) { >+ >+ case JOB_VERIFY_ACTIVE: >+ case JOB_START: >+ case JOB_STOP: >+ case JOB_NOP: >+ return true; >+ >+ case JOB_RESTART: >+ case JOB_TRY_RESTART: >+ return unit_can_start(u); >+ >+ case JOB_RELOAD: >+ return unit_can_reload(u); >+ >+ case JOB_RELOAD_OR_START: >+ return unit_can_reload(u) && unit_can_start(u); >+ >+ default: >+ assert_not_reached("Invalid job type"); >+ } >+} >+ >+int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_reference) { >+ >+ static const UnitDependency inverse_table[_UNIT_DEPENDENCY_MAX] = { >+ [UNIT_REQUIRES] = UNIT_REQUIRED_BY, >+ [UNIT_REQUIRES_OVERRIDABLE] = UNIT_REQUIRED_BY_OVERRIDABLE, >+ [UNIT_WANTS] = UNIT_WANTED_BY, >+ [UNIT_REQUISITE] = UNIT_REQUIRED_BY, >+ [UNIT_REQUISITE_OVERRIDABLE] = UNIT_REQUIRED_BY_OVERRIDABLE, >+ [UNIT_BINDS_TO] = UNIT_BOUND_BY, >+ [UNIT_PART_OF] = UNIT_CONSISTS_OF, >+ [UNIT_REQUIRED_BY] = _UNIT_DEPENDENCY_INVALID, >+ [UNIT_REQUIRED_BY_OVERRIDABLE] = _UNIT_DEPENDENCY_INVALID, >+ [UNIT_WANTED_BY] = _UNIT_DEPENDENCY_INVALID, >+ [UNIT_BOUND_BY] = UNIT_BINDS_TO, >+ [UNIT_CONSISTS_OF] = UNIT_PART_OF, >+ [UNIT_CONFLICTS] = UNIT_CONFLICTED_BY, >+ [UNIT_CONFLICTED_BY] = UNIT_CONFLICTS, >+ [UNIT_BEFORE] = UNIT_AFTER, >+ [UNIT_AFTER] = UNIT_BEFORE, >+ [UNIT_ON_FAILURE] = _UNIT_DEPENDENCY_INVALID, >+ [UNIT_REFERENCES] = UNIT_REFERENCED_BY, >+ [UNIT_REFERENCED_BY] = UNIT_REFERENCES, >+ [UNIT_TRIGGERS] = UNIT_TRIGGERED_BY, >+ [UNIT_TRIGGERED_BY] = UNIT_TRIGGERS, >+ [UNIT_PROPAGATES_RELOAD_TO] = UNIT_RELOAD_PROPAGATED_FROM, >+ [UNIT_RELOAD_PROPAGATED_FROM] = UNIT_PROPAGATES_RELOAD_TO, >+ }; >+ int r, q = 0, v = 0, w = 0; >+ >+ assert(u); >+ assert(d >= 0 && d < _UNIT_DEPENDENCY_MAX); >+ assert(other); >+ >+ u = unit_follow_merge(u); >+ other = unit_follow_merge(other); >+ >+ /* We won't allow dependencies on ourselves. We will not >+ * consider them an error however. */ >+ if (u == other) >+ return 0; >+ >+ if ((r = set_ensure_allocated(&u->dependencies[d], trivial_hash_func, trivial_compare_func)) < 0) >+ return r; >+ >+ if (inverse_table[d] != _UNIT_DEPENDENCY_INVALID) >+ if ((r = set_ensure_allocated(&other->dependencies[inverse_table[d]], trivial_hash_func, trivial_compare_func)) < 0) >+ return r; >+ >+ if (add_reference) >+ if ((r = set_ensure_allocated(&u->dependencies[UNIT_REFERENCES], trivial_hash_func, trivial_compare_func)) < 0 || >+ (r = set_ensure_allocated(&other->dependencies[UNIT_REFERENCED_BY], trivial_hash_func, trivial_compare_func)) < 0) >+ return r; >+ >+ if ((q = set_put(u->dependencies[d], other)) < 0) >+ return q; >+ >+ if (inverse_table[d] != _UNIT_DEPENDENCY_INVALID) >+ if ((v = set_put(other->dependencies[inverse_table[d]], u)) < 0) { >+ r = v; >+ goto fail; >+ } >+ >+ if (add_reference) { >+ if ((w = set_put(u->dependencies[UNIT_REFERENCES], other)) < 0) { >+ r = w; >+ goto fail; >+ } >+ >+ if ((r = set_put(other->dependencies[UNIT_REFERENCED_BY], u)) < 0) >+ goto fail; >+ } >+ >+ unit_add_to_dbus_queue(u); >+ return 0; >+ >+fail: >+ if (q > 0) >+ set_remove(u->dependencies[d], other); >+ >+ if (v > 0) >+ set_remove(other->dependencies[inverse_table[d]], u); >+ >+ if (w > 0) >+ set_remove(u->dependencies[UNIT_REFERENCES], other); >+ >+ return r; >+} >+ >+int unit_add_two_dependencies(Unit *u, UnitDependency d, UnitDependency e, Unit *other, bool add_reference) { >+ int r; >+ >+ assert(u); >+ >+ if ((r = unit_add_dependency(u, d, other, add_reference)) < 0) >+ return r; >+ >+ if ((r = unit_add_dependency(u, e, other, add_reference)) < 0) >+ return r; >+ >+ return 0; >+} >+ >+static const char *resolve_template(Unit *u, const char *name, const char*path, char **p) { >+ char *s; >+ >+ assert(u); >+ assert(name || path); >+ assert(p); >+ >+ if (!name) >+ name = path_get_file_name(path); >+ >+ if (!unit_name_is_template(name)) { >+ *p = NULL; >+ return name; >+ } >+ >+ if (u->instance) >+ s = unit_name_replace_instance(name, u->instance); >+ else { >+ _cleanup_free_ char *i = NULL; >+ >+ i = unit_name_to_prefix(u->id); >+ if (!i) >+ return NULL; >+ >+ s = unit_name_replace_instance(name, i); >+ } >+ >+ if (!s) >+ return NULL; >+ >+ *p = s; >+ return s; >+} >+ >+int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name, const char *path, bool add_reference) { >+ Unit *other; >+ int r; >+ _cleanup_free_ char *s = NULL; >+ >+ assert(u); >+ assert(name || path); >+ >+ name = resolve_template(u, name, path, &s); >+ if (!name) >+ return -ENOMEM; >+ >+ r = manager_load_unit(u->manager, name, path, NULL, &other); >+ if (r < 0) >+ return r; >+ >+ return unit_add_dependency(u, d, other, add_reference); >+} >+ >+int unit_add_two_dependencies_by_name(Unit *u, UnitDependency d, UnitDependency e, const char *name, const char *path, bool add_reference) { >+ Unit *other; >+ int r; >+ _cleanup_free_ char *s = NULL; >+ >+ assert(u); >+ assert(name || path); >+ >+ if (!(name = resolve_template(u, name, path, &s))) >+ return -ENOMEM; >+ >+ if ((r = manager_load_unit(u->manager, name, path, NULL, &other)) < 0) >+ return r; >+ >+ r = unit_add_two_dependencies(u, d, e, other, add_reference); >+ >+ return r; >+} >+ >+int unit_add_dependency_by_name_inverse(Unit *u, UnitDependency d, const char *name, const char *path, bool add_reference) { >+ Unit *other; >+ int r; >+ _cleanup_free_ char *s = NULL; >+ >+ assert(u); >+ assert(name || path); >+ >+ if (!(name = resolve_template(u, name, path, &s))) >+ return -ENOMEM; >+ >+ if ((r = manager_load_unit(u->manager, name, path, NULL, &other)) < 0) >+ return r; >+ >+ r = unit_add_dependency(other, d, u, add_reference); >+ >+ return r; >+} >+ >+int unit_add_two_dependencies_by_name_inverse(Unit *u, UnitDependency d, UnitDependency e, const char *name, const char *path, bool add_reference) { >+ Unit *other; >+ int r; >+ _cleanup_free_ char *s = NULL; >+ >+ assert(u); >+ assert(name || path); >+ >+ if (!(name = resolve_template(u, name, path, &s))) >+ return -ENOMEM; >+ >+ if ((r = manager_load_unit(u->manager, name, path, NULL, &other)) < 0) >+ return r; >+ >+ if ((r = unit_add_two_dependencies(other, d, e, u, add_reference)) < 0) >+ return r; >+ >+ return r; >+} >+ >+int set_unit_path(const char *p) { >+ _cleanup_free_ char *c = NULL; >+ >+ /* This is mostly for debug purposes */ >+ c = path_make_absolute_cwd(p); >+ if (setenv("SYSTEMD_UNIT_PATH", c, 0) < 0) >+ return -errno; >+ >+ return 0; >+} >+ >+char *unit_dbus_path(Unit *u) { >+ assert(u); >+ >+ if (!u->id) >+ return NULL; >+ >+ return unit_dbus_path_from_name(u->id); >+} >+ >+char *unit_default_cgroup_path(Unit *u) { >+ _cleanup_free_ char *escaped = NULL, *slice = NULL; >+ int r; >+ >+ assert(u); >+ >+ if (unit_has_name(u, SPECIAL_ROOT_SLICE)) >+ return strdup(u->manager->cgroup_root); >+ >+ if (UNIT_ISSET(u->slice) && !unit_has_name(UNIT_DEREF(u->slice), SPECIAL_ROOT_SLICE)) { >+ r = cg_slice_to_path(UNIT_DEREF(u->slice)->id, &slice); >+ if (r < 0) >+ return NULL; >+ } >+ >+ escaped = cg_escape(u->id); >+ if (!escaped) >+ return NULL; >+ >+ if (slice) >+ return strjoin(u->manager->cgroup_root, "/", slice, "/", escaped, NULL); >+ else >+ return strjoin(u->manager->cgroup_root, "/", escaped, NULL); >+} >+ >+int unit_add_default_slice(Unit *u) { >+ _cleanup_free_ char *b = NULL; >+ const char *slice_name; >+ Unit *slice; >+ int r; >+ >+ assert(u); >+ >+ if (UNIT_ISSET(u->slice)) >+ return 0; >+ >+ if (!unit_get_cgroup_context(u)) >+ return 0; >+ >+ if (u->instance) { >+ _cleanup_free_ char *prefix = NULL, *escaped = NULL; >+ >+ /* Implicitly place all instantiated units in their >+ * own per-template slice */ >+ >+ prefix = unit_name_to_prefix(u->id); >+ if (!prefix) >+ return -ENOMEM; >+ >+ /* The prefix is already escaped, but it might include >+ * "-" which has a special meaning for slice units, >+ * hence escape it here extra. */ >+ escaped = strreplace(prefix, "-", "\\x2d"); >+ if (!escaped) >+ return -ENOMEM; >+ >+ if (u->manager->running_as == SYSTEMD_SYSTEM) >+ b = strjoin("system-", escaped, ".slice", NULL); >+ else >+ b = strappend(escaped, ".slice"); >+ if (!b) >+ return -ENOMEM; >+ >+ slice_name = b; >+ } else >+ slice_name = >+ u->manager->running_as == SYSTEMD_SYSTEM >+ ? SPECIAL_SYSTEM_SLICE >+ : SPECIAL_ROOT_SLICE; >+ >+ r = manager_load_unit(u->manager, slice_name, NULL, NULL, &slice); >+ if (r < 0) >+ return r; >+ >+ unit_ref_set(&u->slice, slice); >+ return 0; >+} >+ >+const char *unit_slice_name(Unit *u) { >+ assert(u); >+ >+ if (!UNIT_ISSET(u->slice)) >+ return NULL; >+ >+ return UNIT_DEREF(u->slice)->id; >+} >+ >+int unit_load_related_unit(Unit *u, const char *type, Unit **_found) { >+ _cleanup_free_ char *t = NULL; >+ int r; >+ >+ assert(u); >+ assert(type); >+ assert(_found); >+ >+ t = unit_name_change_suffix(u->id, type); >+ if (!t) >+ return -ENOMEM; >+ >+ assert(!unit_has_name(u, t)); >+ >+ r = manager_load_unit(u->manager, t, NULL, NULL, _found); >+ assert(r < 0 || *_found != u); >+ return r; >+} >+ >+int unit_get_related_unit(Unit *u, const char *type, Unit **_found) { >+ _cleanup_free_ char *t = NULL; >+ Unit *found; >+ >+ assert(u); >+ assert(type); >+ assert(_found); >+ >+ t = unit_name_change_suffix(u->id, type); >+ if (!t) >+ return -ENOMEM; >+ >+ assert(!unit_has_name(u, t)); >+ >+ found = manager_get_unit(u->manager, t); >+ if (!found) >+ return -ENOENT; >+ >+ *_found = found; >+ return 0; >+} >+ >+int unit_watch_bus_name(Unit *u, const char *name) { >+ assert(u); >+ assert(name); >+ >+ /* Watch a specific name on the bus. We only support one unit >+ * watching each name for now. */ >+ >+ return hashmap_put(u->manager->watch_bus, name, u); >+} >+ >+void unit_unwatch_bus_name(Unit *u, const char *name) { >+ assert(u); >+ assert(name); >+ >+ hashmap_remove_value(u->manager->watch_bus, name, u); >+} >+ >+bool unit_can_serialize(Unit *u) { >+ assert(u); >+ >+ return UNIT_VTABLE(u)->serialize && UNIT_VTABLE(u)->deserialize_item; >+} >+ >+int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs) { >+ int r; >+ >+ assert(u); >+ assert(f); >+ assert(fds); >+ >+ if (!unit_can_serialize(u)) >+ return 0; >+ >+ r = UNIT_VTABLE(u)->serialize(u, f, fds); >+ if (r < 0) >+ return r; >+ >+ >+ if (serialize_jobs) { >+ if (u->job) { >+ fprintf(f, "job\n"); >+ job_serialize(u->job, f, fds); >+ } >+ >+ if (u->nop_job) { >+ fprintf(f, "job\n"); >+ job_serialize(u->nop_job, f, fds); >+ } >+ } >+ >+ dual_timestamp_serialize(f, "inactive-exit-timestamp", &u->inactive_exit_timestamp); >+ dual_timestamp_serialize(f, "active-enter-timestamp", &u->active_enter_timestamp); >+ dual_timestamp_serialize(f, "active-exit-timestamp", &u->active_exit_timestamp); >+ dual_timestamp_serialize(f, "inactive-enter-timestamp", &u->inactive_enter_timestamp); >+ dual_timestamp_serialize(f, "condition-timestamp", &u->condition_timestamp); >+ >+ if (dual_timestamp_is_set(&u->condition_timestamp)) >+ unit_serialize_item(u, f, "condition-result", yes_no(u->condition_result)); >+ >+ unit_serialize_item(u, f, "transient", yes_no(u->transient)); >+ >+ if (u->cgroup_path) >+ unit_serialize_item(u, f, "cgroup", u->cgroup_path); >+ >+ /* End marker */ >+ fputc('\n', f); >+ return 0; >+} >+ >+void unit_serialize_item_format(Unit *u, FILE *f, const char *key, const char *format, ...) { >+ va_list ap; >+ >+ assert(u); >+ assert(f); >+ assert(key); >+ assert(format); >+ >+ fputs(key, f); >+ fputc('=', f); >+ >+ va_start(ap, format); >+ vfprintf(f, format, ap); >+ va_end(ap); >+ >+ fputc('\n', f); >+} >+ >+void unit_serialize_item(Unit *u, FILE *f, const char *key, const char *value) { >+ assert(u); >+ assert(f); >+ assert(key); >+ assert(value); >+ >+ fprintf(f, "%s=%s\n", key, value); >+} >+ >+int unit_deserialize(Unit *u, FILE *f, FDSet *fds) { >+ int r; >+ >+ assert(u); >+ assert(f); >+ assert(fds); >+ >+ if (!unit_can_serialize(u)) >+ return 0; >+ >+ for (;;) { >+ char line[LINE_MAX], *l, *v; >+ size_t k; >+ >+ if (!fgets(line, sizeof(line), f)) { >+ if (feof(f)) >+ return 0; >+ return -errno; >+ } >+ >+ char_array_0(line); >+ l = strstrip(line); >+ >+ /* End marker */ >+ if (l[0] == 0) >+ return 0; >+ >+ k = strcspn(l, "="); >+ >+ if (l[k] == '=') { >+ l[k] = 0; >+ v = l+k+1; >+ } else >+ v = l+k; >+ >+ if (streq(l, "job")) { >+ if (v[0] == '\0') { >+ /* new-style serialized job */ >+ Job *j = job_new_raw(u); >+ if (!j) >+ return -ENOMEM; >+ >+ r = job_deserialize(j, f, fds); >+ if (r < 0) { >+ job_free(j); >+ return r; >+ } >+ >+ r = hashmap_put(u->manager->jobs, UINT32_TO_PTR(j->id), j); >+ if (r < 0) { >+ job_free(j); >+ return r; >+ } >+ >+ r = job_install_deserialized(j); >+ if (r < 0) { >+ hashmap_remove(u->manager->jobs, UINT32_TO_PTR(j->id)); >+ job_free(j); >+ return r; >+ } >+ >+ if (j->state == JOB_RUNNING) >+ u->manager->n_running_jobs++; >+ } else { >+ /* legacy */ >+ JobType type = job_type_from_string(v); >+ if (type < 0) >+ log_debug("Failed to parse job type value %s", v); >+ else >+ u->deserialized_job = type; >+ } >+ continue; >+ } else if (streq(l, "inactive-exit-timestamp")) { >+ dual_timestamp_deserialize(v, &u->inactive_exit_timestamp); >+ continue; >+ } else if (streq(l, "active-enter-timestamp")) { >+ dual_timestamp_deserialize(v, &u->active_enter_timestamp); >+ continue; >+ } else if (streq(l, "active-exit-timestamp")) { >+ dual_timestamp_deserialize(v, &u->active_exit_timestamp); >+ continue; >+ } else if (streq(l, "inactive-enter-timestamp")) { >+ dual_timestamp_deserialize(v, &u->inactive_enter_timestamp); >+ continue; >+ } else if (streq(l, "condition-timestamp")) { >+ dual_timestamp_deserialize(v, &u->condition_timestamp); >+ continue; >+ } else if (streq(l, "condition-result")) { >+ int b; >+ >+ b = parse_boolean(v); >+ if (b < 0) >+ log_debug("Failed to parse condition result value %s", v); >+ else >+ u->condition_result = b; >+ >+ continue; >+ >+ } else if (streq(l, "transient")) { >+ int b; >+ >+ b = parse_boolean(v); >+ if (b < 0) >+ log_debug("Failed to parse transient bool %s", v); >+ else >+ u->transient = b; >+ >+ continue; >+ } else if (streq(l, "cgroup")) { >+ char *s; >+ >+ s = strdup(v); >+ if (!s) >+ return -ENOMEM; >+ >+ free(u->cgroup_path); >+ u->cgroup_path = s; >+ >+ assert(hashmap_put(u->manager->cgroup_unit, s, u) == 1); >+ continue; >+ } >+ >+ r = UNIT_VTABLE(u)->deserialize_item(u, l, v, fds); >+ if (r < 0) >+ return r; >+ } >+} >+ >+int unit_add_node_link(Unit *u, const char *what, bool wants) { >+ Unit *device; >+ _cleanup_free_ char *e = NULL; >+ int r; >+ >+ assert(u); >+ >+ if (!what) >+ return 0; >+ >+ /* Adds in links to the device node that this unit is based on */ >+ >+ if (!is_device_path(what)) >+ return 0; >+ >+ e = unit_name_from_path(what, ".device"); >+ if (!e) >+ return -ENOMEM; >+ >+ r = manager_load_unit(u->manager, e, NULL, NULL, &device); >+ >+ if (r < 0) >+ return r; >+ >+ r = unit_add_two_dependencies(u, UNIT_AFTER, UNIT_BINDS_TO, device, true); >+ if (r < 0) >+ return r; >+ >+ if (wants) { >+ r = unit_add_dependency(device, UNIT_WANTS, u, false); >+ if (r < 0) >+ return r; >+ } >+ >+ return 0; >+} >+ >+int unit_coldplug(Unit *u) { >+ int r; >+ >+ assert(u); >+ >+ if (UNIT_VTABLE(u)->coldplug) >+ if ((r = UNIT_VTABLE(u)->coldplug(u)) < 0) >+ return r; >+ >+ if (u->job) { >+ r = job_coldplug(u->job); >+ if (r < 0) >+ return r; >+ } else if (u->deserialized_job >= 0) { >+ /* legacy */ >+ r = manager_add_job(u->manager, u->deserialized_job, u, JOB_IGNORE_REQUIREMENTS, false, NULL, NULL); >+ if (r < 0) >+ return r; >+ >+ u->deserialized_job = _JOB_TYPE_INVALID; >+ } >+ >+ return 0; >+} >+ >+#pragma GCC diagnostic push >+#pragma GCC diagnostic ignored "-Wformat-nonliteral" >+void unit_status_printf(Unit *u, const char *status, const char *unit_status_msg_format) { >+ manager_status_printf(u->manager, false, status, unit_status_msg_format, unit_description(u)); >+} >+#pragma GCC diagnostic pop >+ >+bool unit_need_daemon_reload(Unit *u) { >+ _cleanup_strv_free_ char **t = NULL; >+ char **path; >+ struct stat st; >+ unsigned loaded_cnt, current_cnt; >+ >+ assert(u); >+ >+ if (u->fragment_path) { >+ zero(st); >+ if (stat(u->fragment_path, &st) < 0) >+ /* What, cannot access this anymore? */ >+ return true; >+ >+ if (u->fragment_mtime > 0 && >+ timespec_load(&st.st_mtim) != u->fragment_mtime) >+ return true; >+ } >+ >+ if (u->source_path) { >+ zero(st); >+ if (stat(u->source_path, &st) < 0) >+ return true; >+ >+ if (u->source_mtime > 0 && >+ timespec_load(&st.st_mtim) != u->source_mtime) >+ return true; >+ } >+ >+ t = unit_find_dropin_paths(u); >+ loaded_cnt = strv_length(t); >+ current_cnt = strv_length(u->dropin_paths); >+ >+ if (loaded_cnt == current_cnt) { >+ if (loaded_cnt == 0) >+ return false; >+ >+ if (strv_overlap(u->dropin_paths, t)) { >+ STRV_FOREACH(path, u->dropin_paths) { >+ zero(st); >+ if (stat(*path, &st) < 0) >+ return true; >+ >+ if (u->dropin_mtime > 0 && >+ timespec_load(&st.st_mtim) > u->dropin_mtime) >+ return true; >+ } >+ >+ return false; >+ } else >+ return true; >+ } else >+ return true; >+} >+ >+void unit_reset_failed(Unit *u) { >+ assert(u); >+ >+ if (UNIT_VTABLE(u)->reset_failed) >+ UNIT_VTABLE(u)->reset_failed(u); >+} >+ >+Unit *unit_following(Unit *u) { >+ assert(u); >+ >+ if (UNIT_VTABLE(u)->following) >+ return UNIT_VTABLE(u)->following(u); >+ >+ return NULL; >+} >+ >+bool unit_stop_pending(Unit *u) { >+ assert(u); >+ >+ /* This call does check the current state of the unit. It's >+ * hence useful to be called from state change calls of the >+ * unit itself, where the state isn't updated yet. This is >+ * different from unit_inactive_or_pending() which checks both >+ * the current state and for a queued job. */ >+ >+ return u->job && u->job->type == JOB_STOP; >+} >+ >+bool unit_inactive_or_pending(Unit *u) { >+ assert(u); >+ >+ /* Returns true if the unit is inactive or going down */ >+ >+ if (UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u))) >+ return true; >+ >+ if (unit_stop_pending(u)) >+ return true; >+ >+ return false; >+} >+ >+bool unit_active_or_pending(Unit *u) { >+ assert(u); >+ >+ /* Returns true if the unit is active or going up */ >+ >+ if (UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u))) >+ return true; >+ >+ if (u->job && >+ (u->job->type == JOB_START || >+ u->job->type == JOB_RELOAD_OR_START || >+ u->job->type == JOB_RESTART)) >+ return true; >+ >+ return false; >+} >+ >+int unit_kill(Unit *u, KillWho w, int signo, DBusError *error) { >+ assert(u); >+ assert(w >= 0 && w < _KILL_WHO_MAX); >+ assert(signo > 0); >+ assert(signo < _NSIG); >+ >+ if (!UNIT_VTABLE(u)->kill) >+ return -ENOTSUP; >+ >+ return UNIT_VTABLE(u)->kill(u, w, signo, error); >+} >+ >+static Set *unit_pid_set(pid_t main_pid, pid_t control_pid) { >+ Set *pid_set; >+ int r; >+ >+ pid_set = set_new(trivial_hash_func, trivial_compare_func); >+ if (!pid_set) >+ return NULL; >+ >+ /* Exclude the main/control pids from being killed via the cgroup */ >+ if (main_pid > 0) { >+ r = set_put(pid_set, LONG_TO_PTR(main_pid)); >+ if (r < 0) >+ goto fail; >+ } >+ >+ if (control_pid > 0) { >+ r = set_put(pid_set, LONG_TO_PTR(control_pid)); >+ if (r < 0) >+ goto fail; >+ } >+ >+ return pid_set; >+ >+fail: >+ set_free(pid_set); >+ return NULL; >+} >+ >+int unit_kill_common( >+ Unit *u, >+ KillWho who, >+ int signo, >+ pid_t main_pid, >+ pid_t control_pid, >+ DBusError *error) { >+ >+ int r = 0; >+ >+ if (who == KILL_MAIN && main_pid <= 0) { >+ if (main_pid < 0) >+ dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "%s units have no main processes", unit_type_to_string(u->type)); >+ else >+ dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No main process to kill"); >+ return -ESRCH; >+ } >+ >+ if (who == KILL_CONTROL && control_pid <= 0) { >+ if (control_pid < 0) >+ dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "%s units have no control processes", unit_type_to_string(u->type)); >+ else >+ dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill"); >+ return -ESRCH; >+ } >+ >+ if (who == KILL_CONTROL || who == KILL_ALL) >+ if (control_pid > 0) >+ if (kill(control_pid, signo) < 0) >+ r = -errno; >+ >+ if (who == KILL_MAIN || who == KILL_ALL) >+ if (main_pid > 0) >+ if (kill(main_pid, signo) < 0) >+ r = -errno; >+ >+ if (who == KILL_ALL && u->cgroup_path) { >+ _cleanup_set_free_ Set *pid_set = NULL; >+ int q; >+ >+ /* Exclude the main/control pids from being killed via the cgroup */ >+ pid_set = unit_pid_set(main_pid, control_pid); >+ if (!pid_set) >+ return -ENOMEM; >+ >+ q = cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, signo, false, true, false, pid_set); >+ if (q < 0 && q != -EAGAIN && q != -ESRCH && q != -ENOENT) >+ r = q; >+ } >+ >+ return r; >+} >+ >+int unit_following_set(Unit *u, Set **s) { >+ assert(u); >+ assert(s); >+ >+ if (UNIT_VTABLE(u)->following_set) >+ return UNIT_VTABLE(u)->following_set(u, s); >+ >+ *s = NULL; >+ return 0; >+} >+ >+UnitFileState unit_get_unit_file_state(Unit *u) { >+ assert(u); >+ >+ if (u->unit_file_state < 0 && u->fragment_path) >+ u->unit_file_state = unit_file_get_state( >+ u->manager->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, >+ NULL, path_get_file_name(u->fragment_path)); >+ >+ return u->unit_file_state; >+} >+ >+Unit* unit_ref_set(UnitRef *ref, Unit *u) { >+ assert(ref); >+ assert(u); >+ >+ if (ref->unit) >+ unit_ref_unset(ref); >+ >+ ref->unit = u; >+ LIST_PREPEND(UnitRef, refs, u->refs, ref); >+ return u; >+} >+ >+void unit_ref_unset(UnitRef *ref) { >+ assert(ref); >+ >+ if (!ref->unit) >+ return; >+ >+ LIST_REMOVE(UnitRef, refs, ref->unit->refs, ref); >+ ref->unit = NULL; >+} >+ >+int unit_add_mount_links(Unit *u) { >+ char **i; >+ int r; >+ >+ assert(u); >+ >+ STRV_FOREACH(i, u->requires_mounts_for) { >+ char prefix[strlen(*i) + 1]; >+ >+ PATH_FOREACH_PREFIX_MORE(prefix, *i) { >+ Unit *m; >+ >+ r = manager_get_unit_by_path(u->manager, prefix, ".mount", &m); >+ if (r < 0) >+ return r; >+ if (r == 0) >+ continue; >+ if (m == u) >+ continue; >+ >+ if (m->load_state != UNIT_LOADED) >+ continue; >+ >+ r = unit_add_dependency(u, UNIT_AFTER, m, true); >+ if (r < 0) >+ return r; >+ >+ if (m->fragment_path) { >+ r = unit_add_dependency(u, UNIT_REQUIRES, m, true); >+ if (r < 0) >+ return r; >+ } >+ } >+ } >+ >+ return 0; >+} >+ >+int unit_exec_context_defaults(Unit *u, ExecContext *c) { >+ unsigned i; >+ int r; >+ >+ assert(u); >+ assert(c); >+ >+ /* This only copies in the ones that need memory */ >+ for (i = 0; i < RLIMIT_NLIMITS; i++) >+ if (u->manager->rlimit[i] && !c->rlimit[i]) { >+ c->rlimit[i] = newdup(struct rlimit, u->manager->rlimit[i], 1); >+ if (!c->rlimit[i]) >+ return -ENOMEM; >+ } >+ >+ if (u->manager->running_as == SYSTEMD_USER && >+ !c->working_directory) { >+ >+ r = get_home_dir(&c->working_directory); >+ if (r < 0) >+ return r; >+ } >+ >+ return 0; >+} >+ >+ExecContext *unit_get_exec_context(Unit *u) { >+ size_t offset; >+ assert(u); >+ >+ offset = UNIT_VTABLE(u)->exec_context_offset; >+ if (offset <= 0) >+ return NULL; >+ >+ return (ExecContext*) ((uint8_t*) u + offset); >+} >+ >+CGroupContext *unit_get_cgroup_context(Unit *u) { >+ size_t offset; >+ >+ offset = UNIT_VTABLE(u)->cgroup_context_offset; >+ if (offset <= 0) >+ return NULL; >+ >+ return (CGroupContext*) ((uint8_t*) u + offset); >+} >+ >+static int drop_in_file(Unit *u, UnitSetPropertiesMode mode, const char *name, char **_p, char **_q) { >+ _cleanup_free_ char *b = NULL; >+ char *p, *q; >+ int r; >+ >+ assert(u); >+ assert(name); >+ assert(_p); >+ assert(_q); >+ assert(mode & (UNIT_PERSISTENT|UNIT_RUNTIME)); >+ >+ b = xescape(name, "/."); >+ if (!b) >+ return -ENOMEM; >+ >+ if (!filename_is_safe(b)) >+ return -EINVAL; >+ >+ if (u->manager->running_as == SYSTEMD_USER) { >+ _cleanup_free_ char *c = NULL; >+ >+ r = user_config_home(&c); >+ if (r < 0) >+ return r; >+ if (r == 0) >+ return -ENOENT; >+ >+ p = strjoin(c, "/", u->id, ".d", NULL); >+ } else if (mode & UNIT_PERSISTENT) >+ p = strjoin("/etc/systemd/system/", u->id, ".d", NULL); >+ else >+ p = strjoin("/run/systemd/system/", u->id, ".d", NULL); >+ if (!p) >+ return -ENOMEM; >+ >+ q = strjoin(p, "/90-", b, ".conf", NULL); >+ if (!q) { >+ free(p); >+ return -ENOMEM; >+ } >+ >+ *_p = p; >+ *_q = q; >+ return 0; >+} >+ >+int unit_write_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *data) { >+ _cleanup_free_ char *p = NULL, *q = NULL; >+ int r; >+ >+ assert(u); >+ assert(name); >+ assert(data); >+ >+ if (!(mode & (UNIT_PERSISTENT|UNIT_RUNTIME))) >+ return 0; >+ >+ r = drop_in_file(u, mode, name, &p, &q); >+ if (r < 0) >+ return r; >+ >+ mkdir_p(p, 0755); >+ return write_string_file_atomic_label(q, data); >+} >+ >+int unit_write_drop_in_format(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *format, ...) { >+ _cleanup_free_ char *p = NULL; >+ va_list ap; >+ int r; >+ >+ assert(u); >+ assert(name); >+ assert(format); >+ >+ if (!(mode & (UNIT_PERSISTENT|UNIT_RUNTIME))) >+ return 0; >+ >+ va_start(ap, format); >+ r = vasprintf(&p, format, ap); >+ va_end(ap); >+ >+ if (r < 0) >+ return -ENOMEM; >+ >+ return unit_write_drop_in(u, mode, name, p); >+} >+ >+int unit_write_drop_in_private(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *data) { >+ _cleanup_free_ char *ndata = NULL; >+ >+ assert(u); >+ assert(name); >+ assert(data); >+ >+ if (!UNIT_VTABLE(u)->private_section) >+ return -EINVAL; >+ >+ if (!(mode & (UNIT_PERSISTENT|UNIT_RUNTIME))) >+ return 0; >+ >+ ndata = strjoin("[", UNIT_VTABLE(u)->private_section, "]\n", data, NULL); >+ if (!ndata) >+ return -ENOMEM; >+ >+ return unit_write_drop_in(u, mode, name, ndata); >+} >+ >+int unit_write_drop_in_private_format(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *format, ...) { >+ _cleanup_free_ char *p = NULL; >+ va_list ap; >+ int r; >+ >+ assert(u); >+ assert(name); >+ assert(format); >+ >+ if (!(mode & (UNIT_PERSISTENT|UNIT_RUNTIME))) >+ return 0; >+ >+ va_start(ap, format); >+ r = vasprintf(&p, format, ap); >+ va_end(ap); >+ >+ if (r < 0) >+ return -ENOMEM; >+ >+ return unit_write_drop_in_private(u, mode, name, p); >+} >+ >+int unit_remove_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name) { >+ _cleanup_free_ char *p = NULL, *q = NULL; >+ int r; >+ >+ assert(u); >+ >+ if (!(mode & (UNIT_PERSISTENT|UNIT_RUNTIME))) >+ return 0; >+ >+ r = drop_in_file(u, mode, name, &p, &q); >+ if (r < 0) >+ return r; >+ >+ if (unlink(q) < 0) >+ r = errno == ENOENT ? 0 : -errno; >+ else >+ r = 1; >+ >+ rmdir(p); >+ return r; >+} >+ >+int unit_make_transient(Unit *u) { >+ int r; >+ >+ assert(u); >+ >+ u->load_state = UNIT_STUB; >+ u->load_error = 0; >+ u->transient = true; >+ >+ free(u->fragment_path); >+ u->fragment_path = NULL; >+ >+ if (u->manager->running_as == SYSTEMD_USER) { >+ _cleanup_free_ char *c = NULL; >+ >+ r = user_config_home(&c); >+ if (r < 0) >+ return r; >+ if (r == 0) >+ return -ENOENT; >+ >+ u->fragment_path = strjoin(c, "/", u->id, NULL); >+ if (!u->fragment_path) >+ return -ENOMEM; >+ >+ mkdir_p(c, 0755); >+ } else { >+ u->fragment_path = strappend("/run/systemd/system/", u->id); >+ if (!u->fragment_path) >+ return -ENOMEM; >+ >+ mkdir_p("/run/systemd/system", 0755); >+ } >+ >+ return write_string_file_atomic_label(u->fragment_path, "# Transient stub"); >+} >+ >+int unit_kill_context( >+ Unit *u, >+ KillContext *c, >+ bool sigkill, >+ pid_t main_pid, >+ pid_t control_pid, >+ bool main_pid_alien) { >+ >+ int sig, wait_for_exit = 0, r; >+ >+ assert(u); >+ assert(c); >+ >+ if (c->kill_mode == KILL_NONE) >+ return 0; >+ >+ sig = sigkill ? SIGKILL : c->kill_signal; >+ >+ if (main_pid > 0) { >+ r = kill_and_sigcont(main_pid, sig); >+ >+ if (r < 0 && r != -ESRCH) { >+ _cleanup_free_ char *comm = NULL; >+ get_process_comm(main_pid, &comm); >+ >+ log_warning_unit(u->id, "Failed to kill main process %li (%s): %s", >+ (long) main_pid, strna(comm), strerror(-r)); >+ } else { >+ wait_for_exit = !main_pid_alien; >+ >+ if (c->send_sighup) >+ kill(main_pid, SIGHUP); >+ } >+ } >+ >+ if (control_pid > 0) { >+ r = kill_and_sigcont(control_pid, sig); >+ >+ if (r < 0 && r != -ESRCH) { >+ _cleanup_free_ char *comm = NULL; >+ get_process_comm(control_pid, &comm); >+ >+ log_warning_unit(u->id, >+ "Failed to kill control process %li (%s): %s", >+ (long) control_pid, strna(comm), strerror(-r)); >+ } else { >+ wait_for_exit = true; >+ >+ if (c->send_sighup) >+ kill(control_pid, SIGHUP); >+ } >+ } >+ >+ if (c->kill_mode == KILL_CONTROL_GROUP && u->cgroup_path) { >+ _cleanup_set_free_ Set *pid_set = NULL; >+ >+ /* Exclude the main/control pids from being killed via the cgroup */ >+ pid_set = unit_pid_set(main_pid, control_pid); >+ if (!pid_set) >+ return -ENOMEM; >+ >+ r = cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, sig, true, true, false, pid_set); >+ if (r < 0) { >+ if (r != -EAGAIN && r != -ESRCH && r != -ENOENT) >+ log_warning_unit(u->id, "Failed to kill control group: %s", strerror(-r)); >+ } else if (r > 0) { >+ wait_for_exit = true; >+ if (c->send_sighup) { >+ set_free(pid_set); >+ >+ pid_set = unit_pid_set(main_pid, control_pid); >+ if (!pid_set) >+ return -ENOMEM; >+ >+ cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, SIGHUP, true, true, false, pid_set); >+ } >+ } >+ } >+ >+ return wait_for_exit; >+} >+ >+int unit_require_mounts_for(Unit *u, const char *path) { >+ char prefix[strlen(path) + 1], *p; >+ int r; >+ >+ assert(u); >+ assert(path); >+ >+ /* Registers a unit for requiring a certain path and all its >+ * prefixes. We keep a simple array of these paths in the >+ * unit, since its usually short. However, we build a prefix >+ * table for all possible prefixes so that new appearing mount >+ * units can easily determine which units to make themselves a >+ * dependency of. */ >+ >+ p = strdup(path); >+ if (!p) >+ return -ENOMEM; >+ >+ path_kill_slashes(p); >+ >+ if (!path_is_absolute(p)) { >+ free(p); >+ return -EINVAL; >+ } >+ >+ if (!path_is_safe(p)) { >+ free(p); >+ return -EPERM; >+ } >+ >+ if (strv_contains(u->requires_mounts_for, p)) { >+ free(p); >+ return 0; >+ } >+ >+ r = strv_push(&u->requires_mounts_for, p); >+ if (r < 0) { >+ free(p); >+ return r; >+ } >+ >+ PATH_FOREACH_PREFIX_MORE(prefix, p) { >+ Set *x; >+ >+ x = hashmap_get(u->manager->units_requiring_mounts_for, prefix); >+ if (!x) { >+ char *q; >+ >+ if (!u->manager->units_requiring_mounts_for) { >+ u->manager->units_requiring_mounts_for = hashmap_new(string_hash_func, string_compare_func); >+ if (!u->manager->units_requiring_mounts_for) >+ return -ENOMEM; >+ } >+ >+ q = strdup(prefix); >+ if (!q) >+ return -ENOMEM; >+ >+ x = set_new(NULL, NULL); >+ if (!x) { >+ free(q); >+ return -ENOMEM; >+ } >+ >+ r = hashmap_put(u->manager->units_requiring_mounts_for, q, x); >+ if (r < 0) { >+ free(q); >+ set_free(x); >+ return r; >+ } >+ } >+ >+ r = set_put(x, u); >+ if (r < 0) >+ return r; >+ } >+ >+ return 0; >+} >+ >+static const char* const unit_active_state_table[_UNIT_ACTIVE_STATE_MAX] = { >+ [UNIT_ACTIVE] = "active", >+ [UNIT_RELOADING] = "reloading", >+ [UNIT_INACTIVE] = "inactive", >+ [UNIT_FAILED] = "failed", >+ [UNIT_ACTIVATING] = "activating", >+ [UNIT_DEACTIVATING] = "deactivating" >+}; >+ >+DEFINE_STRING_TABLE_LOOKUP(unit_active_state, UnitActiveState); >+ >+static const char* const unit_dependency_table[_UNIT_DEPENDENCY_MAX] = { >+ [UNIT_REQUIRES] = "Requires", >+ [UNIT_REQUIRES_OVERRIDABLE] = "RequiresOverridable", >+ [UNIT_REQUISITE] = "Requisite", >+ [UNIT_REQUISITE_OVERRIDABLE] = "RequisiteOverridable", >+ [UNIT_WANTS] = "Wants", >+ [UNIT_BINDS_TO] = "BindsTo", >+ [UNIT_PART_OF] = "PartOf", >+ [UNIT_REQUIRED_BY] = "RequiredBy", >+ [UNIT_REQUIRED_BY_OVERRIDABLE] = "RequiredByOverridable", >+ [UNIT_WANTED_BY] = "WantedBy", >+ [UNIT_BOUND_BY] = "BoundBy", >+ [UNIT_CONSISTS_OF] = "ConsistsOf", >+ [UNIT_CONFLICTS] = "Conflicts", >+ [UNIT_CONFLICTED_BY] = "ConflictedBy", >+ [UNIT_BEFORE] = "Before", >+ [UNIT_AFTER] = "After", >+ [UNIT_ON_FAILURE] = "OnFailure", >+ [UNIT_TRIGGERS] = "Triggers", >+ [UNIT_TRIGGERED_BY] = "TriggeredBy", >+ [UNIT_PROPAGATES_RELOAD_TO] = "PropagatesReloadTo", >+ [UNIT_RELOAD_PROPAGATED_FROM] = "ReloadPropagatedFrom", >+ [UNIT_REFERENCES] = "References", >+ [UNIT_REFERENCED_BY] = "ReferencedBy", >+}; >+ >+DEFINE_STRING_TABLE_LOOKUP(unit_dependency, UnitDependency); >diff -Naur systemd-208.mod.bck/src/core/unit.h systemd-208.mod/src/core/unit.h >--- systemd-208.mod.bck/src/core/unit.h 2013-09-26 20:20:30.000000000 +0200 >+++ systemd-208.mod/src/core/unit.h 2015-01-26 17:05:21.142276762 +0100 >@@ -198,6 +198,11 @@ > /* CGroup realize members queue */ > LIST_FIELDS(Unit, cgroup_queue); > >+ /* PIDs we keep an eye on. Note that a unit might have many >+ * more, but these are the ones we care enough about to >+ * process SIGCHLD for */ >+ Set *pids; >+ > /* Used during GC sweeps */ > unsigned gc_marker; > >@@ -531,6 +536,10 @@ > > int unit_watch_pid(Unit *u, pid_t pid); > void unit_unwatch_pid(Unit *u, pid_t pid); >+int unit_watch_all_pids(Unit *u); >+void unit_unwatch_all_pids(Unit *u); >+ >+void unit_tidy_watch_pids(Unit *u, pid_t except1, pid_t except2); > > int unit_watch_timer(Unit *u, clockid_t, bool relative, usec_t usec, Watch *w); > void unit_unwatch_timer(Unit *u, Watch *w); >diff -Naur systemd-208.mod.bck/src/login/logind.c systemd-208.mod/src/login/logind.c >--- systemd-208.mod.bck/src/login/logind.c 2013-09-26 20:20:30.000000000 +0200 >+++ systemd-208.mod/src/login/logind.c 2015-01-26 17:05:29.333308850 +0100 >@@ -80,10 +80,11 @@ > m->session_fds = hashmap_new(trivial_hash_func, trivial_compare_func); > m->inhibitor_fds = hashmap_new(trivial_hash_func, trivial_compare_func); > m->button_fds = hashmap_new(trivial_hash_func, trivial_compare_func); >+ m->timer_fds = hashmap_new(trivial_hash_func, trivial_compare_func); > > if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons || !m->busnames || > !m->user_units || !m->session_units || >- !m->session_fds || !m->inhibitor_fds || !m->button_fds) { >+ !m->session_fds || !m->inhibitor_fds || !m->button_fds || !m->timer_fds) { > manager_free(m); > return NULL; > } >@@ -149,6 +150,7 @@ > hashmap_free(m->session_fds); > hashmap_free(m->inhibitor_fds); > hashmap_free(m->button_fds); >+ hashmap_free(m->timer_fds); > > if (m->console_active_fd >= 0) > close_nointr_nofail(m->console_active_fd); >@@ -620,6 +622,13 @@ > return; > } > >+ s = hashmap_get(m->timer_fds, INT_TO_PTR(fd + 1)); >+ if (s) { >+ assert(s->timer_fd == fd); >+ session_stop(s); >+ return; >+ } >+ > i = hashmap_get(m->inhibitor_fds, INT_TO_PTR(fd + 1)); > if (i) { > assert(i->fifo_fd == fd); >@@ -942,8 +951,12 @@ > LIST_REMOVE(Session, gc_queue, m->session_gc_queue, session); > session->in_gc_queue = false; > >- if (session_check_gc(session, drop_not_started) == 0) { >+ /* First, if we are not closing yet, initiate stopping */ >+ if (!session_check_gc(session, drop_not_started) && >+ session_get_state(session) != SESSION_CLOSING) > session_stop(session); >+ >+ if (!session_check_gc(session, drop_not_started)) { > session_finalize(session); > session_free(session); > } >@@ -953,8 +966,11 @@ > LIST_REMOVE(User, gc_queue, m->user_gc_queue, user); > user->in_gc_queue = false; > >- if (user_check_gc(user, drop_not_started) == 0) { >+ if (!user_check_gc(user, drop_not_started) && >+ user_get_state(user) != USER_CLOSING) > user_stop(user); >+ >+ if (!user_check_gc(user, drop_not_started)) { > user_finalize(user); > user_free(user); > } >@@ -1032,6 +1048,7 @@ > > return r; > } >+ > int manager_startup(Manager *m) { > int r; > Seat *seat; >diff -Naur systemd-208.mod.bck/src/login/logind-dbus.c systemd-208.mod/src/login/logind-dbus.c >--- systemd-208.mod.bck/src/login/logind-dbus.c 2015-01-26 11:25:19.000000000 +0100 >+++ systemd-208.mod/src/login/logind-dbus.c 2015-01-26 17:05:44.918369279 +0100 >@@ -1746,13 +1746,7 @@ > if (!session) > return bus_send_error_reply(connection, message, &error, -ENOENT); > >- /* We use the FIFO to detect stray sessions where the >- process invoking PAM dies abnormally. We need to make >- sure that that process is not killed if at the clean >- end of the session it closes the FIFO. Hence, with >- this call explicitly turn off the FIFO logic, so that >- the PAM code can finish clean up on its own */ >- session_remove_fifo(session); >+ session_release(session); > > reply = dbus_message_new_method_return(message); > if (!reply) >@@ -2550,14 +2544,13 @@ > const char *slice, > const char *description, > const char *after, >- const char *kill_mode, >+ const char *after2, > DBusError *error, > char **job) { > >- const char *timeout_stop_property = "TimeoutStopUSec", *send_sighup_property = "SendSIGHUP", *pids_property = "PIDs"; >+ const char *send_sighup_property = "SendSIGHUP", *pids_property = "PIDs", *after_property = "After"; > _cleanup_dbus_message_unref_ DBusMessage *m = NULL, *reply = NULL; > DBusMessageIter iter, sub, sub2, sub3, sub4; >- uint64_t timeout = 500 * USEC_PER_MSEC; > dbus_bool_t send_sighup = true; > const char *fail = "fail"; > uint32_t u; >@@ -2609,8 +2602,6 @@ > } > > if (!isempty(after)) { >- const char *after_property = "After"; >- > if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) || > !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &after_property) || > !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "as", &sub3) || >@@ -2622,13 +2613,13 @@ > return log_oom(); > } > >- if (!isempty(kill_mode)) { >- const char *kill_mode_property = "KillMode"; >- >+ if (!isempty(after2)) { > if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) || >- !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &kill_mode_property) || >- !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "s", &sub3) || >- !dbus_message_iter_append_basic(&sub3, DBUS_TYPE_STRING, &kill_mode) || >+ !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &after_property) || >+ !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "as", &sub3) || >+ !dbus_message_iter_open_container(&sub3, DBUS_TYPE_ARRAY, "s", &sub4) || >+ !dbus_message_iter_append_basic(&sub4, DBUS_TYPE_STRING, &after2) || >+ !dbus_message_iter_close_container(&sub3, &sub4) || > !dbus_message_iter_close_container(&sub2, &sub3) || > !dbus_message_iter_close_container(&sub, &sub2)) > return log_oom(); >@@ -2639,14 +2630,6 @@ > * stop timeout for sessions, so that we don't wait > * forever. */ > >- if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) || >- !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &timeout_stop_property) || >- !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "t", &sub3) || >- !dbus_message_iter_append_basic(&sub3, DBUS_TYPE_UINT64, &timeout) || >- !dbus_message_iter_close_container(&sub2, &sub3) || >- !dbus_message_iter_close_container(&sub, &sub2)) >- return log_oom(); >- > /* Make sure that the session shells are terminated with > * SIGHUP since bash and friends tend to ignore SIGTERM */ > if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) || >@@ -2790,6 +2773,36 @@ > } > > return 1; >+} >+ >+int manager_abandon_scope(Manager *manager, const char *scope, DBusError *error) { >+ _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; >+ _cleanup_free_ char *path = NULL; >+ int r; >+ >+ assert(manager); >+ assert(scope); >+ >+ path = unit_dbus_path_from_name(scope); >+ if (!path) >+ return -ENOMEM; >+ >+ r = bus_method_call_with_reply( >+ manager->bus, >+ "org.freedesktop.systemd1", >+ path, >+ "org.freedesktop.systemd1.Scope", >+ "Abandon", >+ &reply, >+ error, >+ DBUS_TYPE_INVALID); >+ >+ if (r < 0) { >+ log_error("Failed to abandon scope %s", scope); >+ return r; >+ } >+ >+ return 1; > } > > int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo, DBusError *error) { >diff -Naur systemd-208.mod.bck/src/login/logind.h systemd-208.mod/src/login/logind.h >--- systemd-208.mod.bck/src/login/logind.h 2013-09-17 20:47:19.000000000 +0200 >+++ systemd-208.mod/src/login/logind.h 2015-01-26 17:05:37.918342034 +0100 >@@ -88,6 +88,7 @@ > Hashmap *session_fds; > Hashmap *inhibitor_fds; > Hashmap *button_fds; >+ Hashmap *timer_fds; > > usec_t inhibit_delay_max; > >@@ -183,9 +184,10 @@ > > int manager_dispatch_delayed(Manager *manager); > >-int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *kill_mode, DBusError *error, char **job); >+int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *after2, DBusError *error, char **job); > int manager_start_unit(Manager *manager, const char *unit, DBusError *error, char **job); > int manager_stop_unit(Manager *manager, const char *unit, DBusError *error, char **job); >+int manager_abandon_scope(Manager *manager, const char *scope, DBusError *error); > int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo, DBusError *error); > int manager_unit_is_active(Manager *manager, const char *unit); > >diff -Naur systemd-208.mod.bck/src/login/logind-session.c systemd-208.mod/src/login/logind-session.c >--- systemd-208.mod.bck/src/login/logind-session.c 2013-09-23 21:31:55.000000000 +0200 >+++ systemd-208.mod/src/login/logind-session.c 2015-01-27 09:13:30.920651848 +0100 >@@ -24,6 +24,7 @@ > #include <unistd.h> > #include <sys/epoll.h> > #include <fcntl.h> >+#include <sys/timerfd.h> > > #include <systemd/sd-id128.h> > #include <systemd/sd-messages.h> >@@ -36,6 +37,8 @@ > #include "dbus-common.h" > #include "logind-session.h" > >+#define RELEASE_SEC 20 >+ > static unsigned devt_hash_func(const void *p) { > uint64_t u = *(const dev_t*)p; > >@@ -86,6 +89,7 @@ > > s->manager = m; > s->fifo_fd = -1; >+ s->timer_fd = -1; > > return s; > } >@@ -505,7 +509,6 @@ > > if (!s->scope) { > _cleanup_free_ char *description = NULL; >- const char *kill_mode; > char *scope, *job; > > description = strjoin("Session ", s->id, " of user ", s->user->name, NULL); >@@ -516,9 +519,7 @@ > if (!scope) > return log_oom(); > >- kill_mode = manager_shall_kill(s->manager, s->user->name) ? "control-group" : "none"; >- >- r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-user-sessions.service", kill_mode, &error, &job); >+ r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", "systemd-user-sessions.service", &error, &job); > if (r < 0) { > log_error("Failed to start session scope %s: %s %s", > scope, bus_error(&error, r), error.name); >@@ -579,23 +580,23 @@ > > s->started = true; > >- /* Save session data */ >+ /* Save data */ > session_save(s); > user_save(s->user); >+ if (s->seat) >+ seat_save(s->seat); > >+ /* Send signals */ > session_send_signal(s, true); >+ user_send_changed(s->user, "Sessions\0"); > > if (s->seat) { >- seat_save(s->seat); >- > if (s->seat->active == s) > seat_send_changed(s->seat, "Sessions\0ActiveSession\0"); > else > seat_send_changed(s->seat, "Sessions\0"); > } > >- user_send_changed(s->user, "Sessions\0"); >- > return 0; > } > >@@ -611,15 +612,24 @@ > if (!s->scope) > return 0; > >- r = manager_stop_unit(s->manager, s->scope, &error, &job); >- if (r < 0) { >- log_error("Failed to stop session scope: %s", bus_error(&error, r)); >- dbus_error_free(&error); >- return r; >- } >+ if (manager_shall_kill(s->manager, s->user->name)) { >+ r = manager_stop_unit(s->manager, s->scope, &error, &job); >+ if (r < 0) { >+ log_error("Failed to stop session scope: %s", bus_error(&error, r)); >+ dbus_error_free(&error); >+ return r; >+ } > >- free(s->scope_job); >- s->scope_job = job; >+ free(s->scope_job); >+ s->scope_job = job; >+ } else { >+ r = manager_abandon_scope(s->manager, s->scope, &error); >+ if (r < 0) { >+ log_error("Failed to abandon session scope: %s", bus_error(&error, r)); >+ dbus_error_free(&error); >+ return r; >+ } >+ } > > return 0; > } >@@ -644,6 +654,19 @@ > return r < 0 ? -errno : 0; > } > >+static void session_close_timer_fd(Session *s) { >+ assert(s); >+ >+ if (s->timer_fd <= 0) >+ return; >+ >+ hashmap_remove(s->manager->timer_fds, INT_TO_PTR(s->timer_fd + 1)); >+ epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_DEL, s->timer_fd, NULL); >+ >+ close_nointr(s->timer_fd); >+ s->timer_fd = -1; >+} >+ > int session_stop(Session *s) { > int r; > >@@ -652,10 +675,18 @@ > if (!s->user) > return -ESTALE; > >+ session_close_timer_fd(s); >+ >+ /* We are going down, don't care about FIFOs anymore */ >+ session_remove_fifo(s); >+ > /* Kill cgroup */ > r = session_stop_scope(s); > >+ s->stopping = true; >+ > session_save(s); >+ user_save(s->user); > > return r; > } >@@ -678,6 +709,8 @@ > "MESSAGE=Removed session %s.", s->id, > NULL); > >+ session_close_timer_fd(s); >+ > /* Kill session devices */ > while ((sd = hashmap_first(s->devices))) > session_device_free(sd); >@@ -698,16 +731,64 @@ > if (s->seat->active == s) > seat_set_active(s->seat, NULL); > >- seat_send_changed(s->seat, "Sessions\0"); > seat_save(s->seat); >+ seat_send_changed(s->seat, "Sessions\0"); > } > >- user_send_changed(s->user, "Sessions\0"); > user_save(s->user); >+ user_send_changed(s->user, "Sessions\0"); > > return r; > } > >+void session_release(Session *s) { >+ int r; >+ >+ struct itimerspec its = { .it_value.tv_sec = RELEASE_SEC }; >+ struct epoll_event ev = {}; >+ >+ assert(s); >+ >+ if (!s->started || s->stopping) >+ return; >+ >+ if (s->timer_fd >= 0) >+ return; >+ >+ s->timer_fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK|TFD_CLOEXEC); >+ if (s->timer_fd < 0) { >+ log_error("Failed to create session release timer fd"); >+ goto out; >+ } >+ >+ r = hashmap_put(s->manager->timer_fds, INT_TO_PTR(s->timer_fd + 1), s); >+ if (r < 0) { >+ log_error("Failed to store session release timer fd"); >+ goto out; >+ } >+ >+ ev.events = EPOLLONESHOT; >+ ev.data.u32 = FD_OTHER_BASE + s->timer_fd; >+ >+ r = epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_ADD, s->timer_fd, &ev); >+ if (r < 0) { >+ log_error("Failed to add session release timer fd to epoll instance"); >+ goto out; >+ } >+ >+ r = timerfd_settime(s->timer_fd, TFD_TIMER_ABSTIME, &its, NULL); >+ if (r < 0) { >+ log_error("Failed to arm timer : %m"); >+ goto out; >+ } >+ >+out: >+ if (s->timer_fd >= 0) { >+ close_nointr(s->timer_fd); >+ s->timer_fd = -1; >+ } >+} >+ > bool session_is_active(Session *s) { > assert(s); > >@@ -904,8 +985,6 @@ > } > > int session_check_gc(Session *s, bool drop_not_started) { >- int r; >- > assert(s); > > if (drop_not_started && !s->started) >@@ -915,11 +994,7 @@ > return 0; > > if (s->fifo_fd >= 0) { >- r = pipe_eof(s->fifo_fd); >- if (r < 0) >- return r; >- >- if (r == 0) >+ if (pipe_eof(s->fifo_fd) <= 0) > return 1; > } > >@@ -945,15 +1020,15 @@ > SessionState session_get_state(Session *s) { > assert(s); > >+ if (s->stopping || s->timer_fd >= 0) >+ return SESSION_CLOSING; >+ > if (s->closing) > return SESSION_CLOSING; > > if (s->scope_job) > return SESSION_OPENING; > >- if (s->fifo_fd < 0) >- return SESSION_CLOSING; >- > if (session_is_active(s)) > return SESSION_ACTIVE; > >diff -Naur systemd-208.mod.bck/src/login/logind-session.h systemd-208.mod/src/login/logind-session.h >--- systemd-208.mod.bck/src/login/logind-session.h 2013-09-18 00:15:30.000000000 +0200 >+++ systemd-208.mod/src/login/logind-session.h 2015-01-26 17:05:29.358308929 +0100 >@@ -98,11 +98,14 @@ > int fifo_fd; > char *fifo_path; > >+ int timer_fd; >+ > bool idle_hint; > dual_timestamp idle_hint_timestamp; > > bool in_gc_queue:1; > bool started:1; >+ bool stopping:1; > bool closing:1; > > DBusMessage *create_message; >@@ -130,6 +133,7 @@ > int session_start(Session *s); > int session_stop(Session *s); > int session_finalize(Session *s); >+void session_release(Session *s); > int session_save(Session *s); > int session_load(Session *s); > int session_kill(Session *s, KillWho who, int signo); >diff -Naur systemd-208.mod.bck/src/login/logind-user.c systemd-208.mod/src/login/logind-user.c >--- systemd-208.mod.bck/src/login/logind-user.c 2015-01-26 11:36:35.000000000 +0100 >+++ systemd-208.mod/src/login/logind-user.c 2015-01-27 11:50:43.183970712 +0100 >@@ -529,6 +529,8 @@ > if (k < 0) > r = k; > >+ u->stopping = true; >+ > user_save(u); > > return r; >@@ -644,26 +646,31 @@ > > UserState user_get_state(User *u) { > Session *i; >- bool all_closing = true; > > assert(u); > > if (u->closing) > return USER_CLOSING; > >+ if (u->stopping) >+ return USER_CLOSING; >+ > if (u->slice_job || u->service_job) > return USER_OPENING; > >- LIST_FOREACH(sessions_by_user, i, u->sessions) { >- if (session_is_active(i)) >- return USER_ACTIVE; >- if (session_get_state(i) != SESSION_CLOSING) >- all_closing = false; >- } >+ if (u->sessions) { >+ bool all_closing = true; > >- if (u->sessions) >- return all_closing ? USER_CLOSING : USER_ONLINE; >+ LIST_FOREACH(sessions_by_user, i, u->sessions) { >+ if (session_is_active(i)) >+ return USER_ACTIVE; >+ if (session_get_state(i) != SESSION_CLOSING) >+ all_closing = false; >+ } > >+ return all_closing ? USER_CLOSING : USER_ONLINE; >+ } >+ > if (user_check_linger_file(u) > 0) > return USER_LINGERING; > >diff -Naur systemd-208.mod.bck/src/login/logind-user.h systemd-208.mod/src/login/logind-user.h >--- systemd-208.mod.bck/src/login/logind-user.h 2013-08-13 22:02:46.000000000 +0200 >+++ systemd-208.mod/src/login/logind-user.h 2015-01-26 17:05:29.358308929 +0100 >@@ -61,6 +61,7 @@ > > bool in_gc_queue:1; > bool started:1; >+ bool stopping:1; > bool closing:1; > > LIST_HEAD(Session, sessions); >diff -Naur systemd-208.mod.bck/src/login/pam-module.c systemd-208.mod/src/login/pam-module.c >--- systemd-208.mod.bck/src/login/pam-module.c 2015-01-26 11:25:19.000000000 +0100 >+++ systemd-208.mod/src/login/pam-module.c 2015-01-26 17:05:29.359308933 +0100 >@@ -490,7 +490,7 @@ > int flags, > int argc, const char **argv) { > >- const void *p = NULL, *existing = NULL; >+ const void *existing = NULL; > const char *id; > DBusConnection *bus = NULL; > DBusMessage *m = NULL, *reply = NULL; >@@ -547,12 +547,15 @@ > } > } > >+ >+ /* Note that we are knowingly leaking the FIFO fd here. This >+ * way, logind can watch us die. If we closed it here it would >+ * not have any clue when that is completed. Given that one >+ * cannot really have multiple PAM sessions open from the same >+ * process this means we will leak one FD at max. */ > r = PAM_SUCCESS; > > finish: >- pam_get_data(handle, "systemd.session-fd", &p); >- if (p) >- close_nointr(PTR_TO_INT(p) - 1); > > dbus_error_free(&error); > >diff -Naur systemd-208.mod.bck/src/run/run.c systemd-208.mod/src/run/run.c >--- systemd-208.mod.bck/src/run/run.c 2013-09-12 14:51:57.000000000 +0200 >+++ systemd-208.mod/src/run/run.c 2015-01-26 17:05:13.845248893 +0100 >@@ -309,6 +309,14 @@ > if (r < 0) > return r; > >+ { >+ const char *unique_id; >+ sd_bus_get_unique_name(bus, &unique_id); >+ r = sd_bus_message_append(m, "(sv)", "Controller", "s", unique_id); >+ if (r < 0) >+ return r; >+ } >+ > r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) getpid()); > if (r < 0) > return r; >diff -Naur systemd-208.mod.bck/src/run/run.c.orig systemd-208.mod/src/run/run.c.orig >--- systemd-208.mod.bck/src/run/run.c.orig 1970-01-01 01:00:00.000000000 +0100 >+++ systemd-208.mod/src/run/run.c.orig 2013-09-12 14:51:57.000000000 +0200 >@@ -0,0 +1,376 @@ >+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ >+ >+/*** >+ This file is part of systemd. >+ >+ Copyright 2013 Lennart Poettering >+ >+ systemd is free software; you can redistribute it and/or modify it >+ under the terms of the GNU Lesser General Public License as published by >+ the Free Software Foundation; either version 2.1 of the License, or >+ (at your option) any later version. >+ >+ systemd is distributed in the hope that it will be useful, but >+ WITHOUT ANY WARRANTY; without even the implied warranty of >+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ Lesser General Public License for more details. >+ >+ You should have received a copy of the GNU Lesser General Public License >+ along with systemd; If not, see <http://www.gnu.org/licenses/>. >+***/ >+ >+#include <stdio.h> >+#include <getopt.h> >+ >+#include "sd-bus.h" >+#include "bus-internal.h" >+#include "bus-message.h" >+#include "strv.h" >+#include "build.h" >+#include "unit-name.h" >+#include "path-util.h" >+ >+static bool arg_scope = false; >+static bool arg_user = false; >+static bool arg_remain_after_exit = false; >+static const char *arg_unit = NULL; >+static const char *arg_description = NULL; >+static const char *arg_slice = NULL; >+static bool arg_send_sighup = false; >+ >+static int help(void) { >+ >+ printf("%s [OPTIONS...] COMMAND [ARGS...]\n\n" >+ "Run the specified command in a transient scope or service unit.\n\n" >+ " -h --help Show this help\n" >+ " --version Show package version\n" >+ " --user Run as user unit\n" >+ " --scope Run this as scope rather than service\n" >+ " --unit=UNIT Run under the specified unit name\n" >+ " --description=TEXT Description for unit\n" >+ " --slice=SLICE Run in the specified slice\n" >+ " -r --remain-after-exit Leave service around until explicitly stopped\n" >+ " --send-sighup Send SIGHUP when terminating\n", >+ program_invocation_short_name); >+ >+ return 0; >+} >+ >+static int parse_argv(int argc, char *argv[]) { >+ >+ enum { >+ ARG_VERSION = 0x100, >+ ARG_USER, >+ ARG_SCOPE, >+ ARG_UNIT, >+ ARG_DESCRIPTION, >+ ARG_SLICE, >+ ARG_SEND_SIGHUP, >+ }; >+ >+ static const struct option options[] = { >+ { "help", no_argument, NULL, 'h' }, >+ { "version", no_argument, NULL, ARG_VERSION }, >+ { "user", no_argument, NULL, ARG_USER }, >+ { "scope", no_argument, NULL, ARG_SCOPE }, >+ { "unit", required_argument, NULL, ARG_UNIT }, >+ { "description", required_argument, NULL, ARG_DESCRIPTION }, >+ { "slice", required_argument, NULL, ARG_SLICE }, >+ { "remain-after-exit", no_argument, NULL, 'r' }, >+ { "send-sighup", no_argument, NULL, ARG_SEND_SIGHUP }, >+ { NULL, 0, NULL, 0 }, >+ }; >+ >+ int c; >+ >+ assert(argc >= 0); >+ assert(argv); >+ >+ while ((c = getopt_long(argc, argv, "+hr", options, NULL)) >= 0) { >+ >+ switch (c) { >+ >+ case 'h': >+ help(); >+ return 0; >+ >+ case ARG_VERSION: >+ puts(PACKAGE_STRING); >+ puts(SYSTEMD_FEATURES); >+ return 0; >+ >+ case ARG_USER: >+ arg_user = true; >+ break; >+ >+ case ARG_SCOPE: >+ arg_scope = true; >+ break; >+ >+ case ARG_UNIT: >+ arg_unit = optarg; >+ break; >+ >+ case ARG_DESCRIPTION: >+ arg_description = optarg; >+ break; >+ >+ case ARG_SLICE: >+ arg_slice = optarg; >+ break; >+ >+ case ARG_SEND_SIGHUP: >+ arg_send_sighup = true; >+ break; >+ >+ case 'r': >+ arg_remain_after_exit = true; >+ break; >+ >+ case '?': >+ return -EINVAL; >+ >+ default: >+ log_error("Unknown option code %c", c); >+ return -EINVAL; >+ } >+ } >+ >+ if (optind >= argc) { >+ log_error("Command line to execute required."); >+ return -EINVAL; >+ } >+ >+ return 1; >+} >+ >+static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bus_message **ret) { >+ _cleanup_bus_message_unref_ sd_bus_message *m = NULL; >+ int r; >+ >+ log_info("Running as unit %s.", name); >+ >+ r = sd_bus_message_new_method_call( >+ bus, >+ "org.freedesktop.systemd1", >+ "/org/freedesktop/systemd1", >+ "org.freedesktop.systemd1.Manager", >+ "StartTransientUnit", &m); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_append(m, "ss", name, "fail"); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_open_container(m, 'a', "(sv)"); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_append(m, "(sv)", "Description", "s", arg_description); >+ if (r < 0) >+ return r; >+ >+ if (!isempty(arg_slice)) { >+ _cleanup_free_ char *slice; >+ >+ slice = unit_name_mangle_with_suffix(arg_slice, ".slice"); >+ if (!slice) >+ return -ENOMEM; >+ >+ r = sd_bus_message_append(m, "(sv)", "Slice", "s", slice); >+ if (r < 0) >+ return r; >+ } >+ >+ r = sd_bus_message_append(m, "(sv)", "SendSIGHUP", "b", arg_send_sighup); >+ if (r < 0) >+ return r; >+ >+ *ret = m; >+ m = NULL; >+ >+ return 0; >+} >+ >+static int message_start_transient_unit_send(sd_bus *bus, sd_bus_message *m, sd_bus_error *error, sd_bus_message **reply) { >+ int r; >+ >+ r = sd_bus_message_close_container(m); >+ if (r < 0) >+ return r; >+ >+ return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply); >+} >+ >+static int start_transient_service( >+ sd_bus *bus, >+ char **argv, >+ sd_bus_error *error) { >+ >+ _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; >+ _cleanup_free_ char *name = NULL; >+ char **i; >+ int r; >+ >+ if (arg_unit) >+ name = unit_name_mangle_with_suffix(arg_unit, ".service"); >+ else >+ asprintf(&name, "run-%lu.service", (unsigned long) getpid()); >+ if (!name) >+ return -ENOMEM; >+ >+ r = message_start_transient_unit_new(bus, name, &m); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_append(m, "(sv)", "RemainAfterExit", "b", arg_remain_after_exit); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_open_container(m, 'r', "sv"); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_append(m, "s", "ExecStart"); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_open_container(m, 'v', "a(sasb)"); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_open_container(m, 'a', "(sasb)"); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_open_container(m, 'r', "sasb"); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_append(m, "s", argv[0]); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_open_container(m, 'a', "s"); >+ if (r < 0) >+ return r; >+ >+ STRV_FOREACH(i, argv) { >+ r = sd_bus_message_append(m, "s", *i); >+ if (r < 0) >+ return r; >+ } >+ >+ r = sd_bus_message_close_container(m); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_append(m, "b", false); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_close_container(m); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_close_container(m); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_close_container(m); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_close_container(m); >+ if (r < 0) >+ return r; >+ >+ return message_start_transient_unit_send(bus, m, error, &reply); >+} >+ >+static int start_transient_scope( >+ sd_bus *bus, >+ char **argv, >+ sd_bus_error *error) { >+ >+ _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; >+ _cleanup_free_ char *name = NULL; >+ int r; >+ >+ if (arg_unit) >+ name = unit_name_mangle_with_suffix(arg_unit, ".scope"); >+ else >+ asprintf(&name, "run-%lu.scope", (unsigned long) getpid()); >+ if (!name) >+ return -ENOMEM; >+ >+ r = message_start_transient_unit_new(bus, name, &m); >+ if (r < 0) >+ return r; >+ >+ r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) getpid()); >+ if (r < 0) >+ return r; >+ >+ r = message_start_transient_unit_send(bus, m, error, &reply); >+ if (r < 0) >+ return r; >+ >+ execvp(argv[0], argv); >+ log_error("Failed to execute: %m"); >+ return -errno; >+} >+ >+int main(int argc, char* argv[]) { >+ sd_bus_error error = SD_BUS_ERROR_NULL; >+ _cleanup_bus_unref_ sd_bus *bus = NULL; >+ _cleanup_free_ char *description = NULL, *command = NULL; >+ int r; >+ >+ log_parse_environment(); >+ log_open(); >+ >+ r = parse_argv(argc, argv); >+ if (r <= 0) >+ goto fail; >+ >+ r = find_binary(argv[optind], &command); >+ if (r < 0) { >+ log_error("Failed to find executable %s: %s", argv[optind], strerror(-r)); >+ goto fail; >+ } >+ argv[optind] = command; >+ >+ if (!arg_description) { >+ description = strv_join(argv + optind, " "); >+ if (!description) { >+ r = log_oom(); >+ goto fail; >+ } >+ >+ arg_description = description; >+ } >+ >+ if (arg_user) >+ r = sd_bus_open_user(&bus); >+ else >+ r = sd_bus_open_system(&bus); >+ if (r < 0) { >+ log_error("Failed to create new bus connection: %s", strerror(-r)); >+ goto fail; >+ } >+ >+ if (arg_scope) >+ r = start_transient_scope(bus, argv + optind, &error); >+ else >+ r = start_transient_service(bus, argv + optind, &error); >+ if (r < 0) { >+ log_error("Failed start transient unit: %s", error.message ? error.message : strerror(-r)); >+ sd_bus_error_free(&error); >+ goto fail; >+ } >+ >+fail: >+ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; >+} >diff -Naur systemd-208.mod.bck/src/shared/dbus-common.c systemd-208.mod/src/shared/dbus-common.c >--- systemd-208.mod.bck/src/shared/dbus-common.c 2015-01-26 11:25:19.000000000 +0100 >+++ systemd-208.mod/src/shared/dbus-common.c 2015-01-26 17:05:13.845248893 +0100 >@@ -1428,3 +1428,45 @@ > > return ":no-sender"; > } >+ >+bool bus_service_name_is_valid(const char *p) { >+ const char *q; >+ bool dot, found_dot = false, unique; >+ >+ if (isempty(p)) >+ return false; >+ >+ unique = p[0] == ':'; >+ >+ for (dot = true, q = unique ? p+1 : p; *q; q++) >+ if (*q == '.') { >+ if (dot) >+ return false; >+ >+ found_dot = dot = true; >+ } else { >+ bool good; >+ >+ good = >+ (*q >= 'a' && *q <= 'z') || >+ (*q >= 'A' && *q <= 'Z') || >+ ((!dot || unique) && *q >= '0' && *q <= '9') || >+ *q == '_' || *q == '-'; >+ >+ if (!good) >+ return false; >+ >+ dot = false; >+ } >+ >+ if (q - p > 255) >+ return false; >+ >+ if (dot) >+ return false; >+ >+ if (!found_dot) >+ return false; >+ >+ return true; >+} >diff -Naur systemd-208.mod.bck/src/shared/dbus-common.h systemd-208.mod/src/shared/dbus-common.h >--- systemd-208.mod.bck/src/shared/dbus-common.h 2013-08-13 22:02:46.000000000 +0200 >+++ systemd-208.mod/src/shared/dbus-common.h 2015-01-26 17:05:13.846248898 +0100 >@@ -242,5 +242,7 @@ > > void bus_message_unrefp(DBusMessage **reply); > >+bool bus_service_name_is_valid(const char *p); >+ > #define _cleanup_dbus_message_unref_ __attribute__((cleanup(bus_message_unrefp))) > #define _cleanup_dbus_error_free_ __attribute__((cleanup(dbus_error_free)))
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=621005">View the attachment on a separate page</a>.</b>
Actions:
View
|
Diff
Attachments on
bug 878853
:
591288
| 621005 |
623656