chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getty: Start getty on 3270 terminals available on Linux on System z
[elogind.git]
/
src
/
core
/
swap.c
diff --git
a/src/core/swap.c
b/src/core/swap.c
index 4e65c701fd1e35db46eecbdcd04b535161523220..7004ede70e91daf7b54b30b3aed07b7493e9ffb5 100644
(file)
--- a/
src/core/swap.c
+++ b/
src/core/swap.c
@@
-124,6
+124,8
@@
static void swap_init(Unit *u) {
kill_context_init(&s->kill_context);
cgroup_context_init(&s->cgroup_context);
kill_context_init(&s->kill_context);
cgroup_context_init(&s->cgroup_context);
+ unit_cgroup_context_init_defaults(u, &s->cgroup_context);
+
s->parameters_proc_swaps.priority = s->parameters_fragment.priority = -1;
s->control_command_id = _SWAP_EXEC_COMMAND_INVALID;
s->parameters_proc_swaps.priority = s->parameters_fragment.priority = -1;
s->control_command_id = _SWAP_EXEC_COMMAND_INVALID;
@@
-155,12
+157,12
@@
static void swap_done(Unit *u) {
free(s->parameters_fragment.what);
s->parameters_fragment.what = NULL;
free(s->parameters_fragment.what);
s->parameters_fragment.what = NULL;
- exec_context_done(&s->exec_context, manager_is_reloading_or_reexecuting(u->manager));
+ cgroup_context_done(&s->cgroup_context);
+ exec_context_done(&s->exec_context);
+ s->exec_runtime = exec_runtime_unref(s->exec_runtime);
exec_command_done_array(s->exec_command, _SWAP_EXEC_COMMAND_MAX);
s->control_command = NULL;
exec_command_done_array(s->exec_command, _SWAP_EXEC_COMMAND_MAX);
s->control_command = NULL;
- cgroup_context_done(&s->cgroup_context);
-
swap_unwatch_control_pid(s);
s->timer_event_source = sd_event_source_unref(s->timer_event_source);
swap_unwatch_control_pid(s);
s->timer_event_source = sd_event_source_unref(s->timer_event_source);
@@
-184,7
+186,7
@@
static int swap_arm_timer(Swap *s) {
return sd_event_source_set_enabled(s->timer_event_source, SD_EVENT_ONESHOT);
}
return sd_event_source_set_enabled(s->timer_event_source, SD_EVENT_ONESHOT);
}
- return sd_event_add_monotonic(UNIT(s)->manager->event,
now(CLOCK_MONOTONIC) + s->timeout_usec, 0, swap_dispatch_timer, s, &s->timer_event_source
);
+ return sd_event_add_monotonic(UNIT(s)->manager->event,
&s->timer_event_source, now(CLOCK_MONOTONIC) + s->timeout_usec, 0, swap_dispatch_timer, s
);
}
static int swap_add_device_links(Swap *s) {
}
static int swap_add_device_links(Swap *s) {
@@
-352,7
+354,7
@@
static int swap_load(Unit *u) {
return r;
}
return r;
}
- r = unit_exec_context_defaults(u, &s->exec_context);
+ r = unit_exec_context_
patch_
defaults(u, &s->exec_context);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-625,6
+627,10
@@
static int swap_spawn(Swap *s, ExecCommand *c, pid_t *_pid) {
unit_realize_cgroup(UNIT(s));
unit_realize_cgroup(UNIT(s));
+ r = unit_setup_exec_runtime(UNIT(s));
+ if (r < 0)
+ goto fail;
+
r = swap_arm_timer(s);
if (r < 0)
goto fail;
r = swap_arm_timer(s);
if (r < 0)
goto fail;
@@
-640,8
+646,11
@@
static int swap_spawn(Swap *s, ExecCommand *c, pid_t *_pid) {
UNIT(s)->manager->confirm_spawn,
UNIT(s)->manager->cgroup_supported,
UNIT(s)->cgroup_path,
UNIT(s)->manager->confirm_spawn,
UNIT(s)->manager->cgroup_supported,
UNIT(s)->cgroup_path,
+ manager_get_runtime_prefix(UNIT(s)->manager),
UNIT(s)->id,
UNIT(s)->id,
+ 0,
NULL,
NULL,
+ s->exec_runtime,
&pid);
if (r < 0)
goto fail;
&pid);
if (r < 0)
goto fail;
@@
-667,7
+676,11
@@
static void swap_enter_dead(Swap *s, SwapResult f) {
if (f != SWAP_SUCCESS)
s->result = f;
if (f != SWAP_SUCCESS)
s->result = f;
- exec_context_tmp_dirs_done(&s->exec_context);
+ exec_runtime_destroy(s->exec_runtime);
+ s->exec_runtime = exec_runtime_unref(s->exec_runtime);
+
+ exec_context_destroy_runtime_directory(&s->exec_context, manager_get_runtime_prefix(UNIT(s)->manager));
+
swap_set_state(s, s->result != SWAP_SUCCESS ? SWAP_FAILED : SWAP_DEAD);
}
swap_set_state(s, s->result != SWAP_SUCCESS ? SWAP_FAILED : SWAP_DEAD);
}
@@
-704,7
+717,11
@@
static void swap_enter_signal(Swap *s, SwapState state, SwapResult f) {
goto fail;
swap_set_state(s, state);
goto fail;
swap_set_state(s, state);
- } else
+ } else if (state == SWAP_ACTIVATING_SIGTERM)
+ swap_enter_signal(s, SWAP_ACTIVATING_SIGKILL, SWAP_SUCCESS);
+ else if (state == SWAP_DEACTIVATING_SIGTERM)
+ swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, SWAP_SUCCESS);
+ else
swap_enter_dead(s, SWAP_SUCCESS);
return;
swap_enter_dead(s, SWAP_SUCCESS);
return;
@@
-867,8
+884,6
@@
static int swap_serialize(Unit *u, FILE *f, FDSet *fds) {
if (s->control_command_id >= 0)
unit_serialize_item(u, f, "control-command", swap_exec_command_to_string(s->control_command_id));
if (s->control_command_id >= 0)
unit_serialize_item(u, f, "control-command", swap_exec_command_to_string(s->control_command_id));
- exec_context_serialize(&s->exec_context, UNIT(s), f);
-
return 0;
}
return 0;
}
@@
-912,22
+927,6
@@
static int swap_deserialize_item(Unit *u, const char *key, const char *value, FD
s->control_command_id = id;
s->control_command = s->exec_command + id;
}
s->control_command_id = id;
s->control_command = s->exec_command + id;
}
- } else if (streq(key, "tmp-dir")) {
- char *t;
-
- t = strdup(value);
- if (!t)
- return log_oom();
-
- s->exec_context.tmp_dir = t;
- } else if (streq(key, "var-tmp-dir")) {
- char *t;
-
- t = strdup(value);
- if (!t)
- return log_oom();
-
- s->exec_context.var_tmp_dir = t;
} else
log_debug_unit(u->id, "Unknown serialization key '%s'", key);
} else
log_debug_unit(u->id, "Unknown serialization key '%s'", key);
@@
-1009,10
+1008,7
@@
static void swap_sigchld_event(Unit *u, pid_t pid, int code, int status) {
case SWAP_DEACTIVATING_SIGKILL:
case SWAP_DEACTIVATING_SIGTERM:
case SWAP_DEACTIVATING_SIGKILL:
case SWAP_DEACTIVATING_SIGTERM:
- if (f == SWAP_SUCCESS)
- swap_enter_dead(s, f);
- else
- swap_enter_dead(s, f);
+ swap_enter_dead(s, f);
break;
default:
break;
default:
@@
-1193,7
+1189,6
@@
static int swap_dispatch_io(sd_event_source *source, int fd, uint32_t revents, v
}
static Unit *swap_following(Unit *u) {
}
static Unit *swap_following(Unit *u) {
- _cleanup_free_ char *p = NULL;
Swap *s = SWAP(u);
Swap *other, *first = NULL;
Swap *s = SWAP(u);
Swap *other, *first = NULL;
@@
-1280,7
+1275,7
@@
static int swap_enumerate(Manager *m) {
if (!m->proc_swaps)
return errno == ENOENT ? 0 : -errno;
if (!m->proc_swaps)
return errno == ENOENT ? 0 : -errno;
- r = sd_event_add_io(m->event,
fileno(m->proc_swaps), EPOLLPRI, swap_dispatch_io, m, &m->swap_event_source
);
+ r = sd_event_add_io(m->event,
&m->swap_event_source, fileno(m->proc_swaps), EPOLLPRI, swap_dispatch_io, m
);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-1347,7
+1342,6
@@
int swap_process_new_device(Manager *m, struct udev_device *dev) {
}
int swap_process_removed_device(Manager *m, struct udev_device *dev) {
}
int swap_process_removed_device(Manager *m, struct udev_device *dev) {
- _cleanup_free_ char *e = NULL;
const char *dn;
int r = 0;
Swap *s;
const char *dn;
int r = 0;
Swap *s;
@@
-1382,6
+1376,20
@@
static int swap_kill(Unit *u, KillWho who, int signo, sd_bus_error *error) {
return unit_kill_common(u, who, signo, -1, SWAP(u)->control_pid, error);
}
return unit_kill_common(u, who, signo, -1, SWAP(u)->control_pid, error);
}
+static int swap_get_timeout(Unit *u, uint64_t *timeout) {
+ Swap *s = SWAP(u);
+ int r;
+
+ if (!s->timer_event_source)
+ return 0;
+
+ r = sd_event_source_get_time(s->timer_event_source, timeout);
+ if (r < 0)
+ return r;
+
+ return 1;
+}
+
static const char* const swap_state_table[_SWAP_STATE_MAX] = {
[SWAP_DEAD] = "dead",
[SWAP_ACTIVATING] = "activating",
static const char* const swap_state_table[_SWAP_STATE_MAX] = {
[SWAP_DEAD] = "dead",
[SWAP_ACTIVATING] = "activating",
@@
-1420,6
+1428,7
@@
const UnitVTable swap_vtable = {
.exec_context_offset = offsetof(Swap, exec_context),
.cgroup_context_offset = offsetof(Swap, cgroup_context),
.kill_context_offset = offsetof(Swap, kill_context),
.exec_context_offset = offsetof(Swap, exec_context),
.cgroup_context_offset = offsetof(Swap, cgroup_context),
.kill_context_offset = offsetof(Swap, kill_context),
+ .exec_runtime_offset = offsetof(Swap, exec_runtime),
.sections =
"Unit\0"
.sections =
"Unit\0"
@@
-1443,6
+1452,8
@@
const UnitVTable swap_vtable = {
.kill = swap_kill,
.kill = swap_kill,
+ .get_timeout = swap_get_timeout,
+
.serialize = swap_serialize,
.deserialize_item = swap_deserialize_item,
.serialize = swap_serialize,
.deserialize_item = swap_deserialize_item,
@@
-1457,7
+1468,6
@@
const UnitVTable swap_vtable = {
.bus_interface = "org.freedesktop.systemd1.Swap",
.bus_vtable = bus_swap_vtable,
.bus_interface = "org.freedesktop.systemd1.Swap",
.bus_vtable = bus_swap_vtable,
- .bus_changing_properties = bus_swap_changing_properties,
.bus_set_property = bus_swap_set_property,
.bus_commit_properties = bus_swap_commit_properties,
.bus_set_property = bus_swap_set_property,
.bus_commit_properties = bus_swap_commit_properties,