chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: move ShowStatus type into the core
[elogind.git]
/
src
/
core
/
swap.c
diff --git
a/src/core/swap.c
b/src/core/swap.c
index 26141e6a33a643db721e1554d36c126b6d9c149c..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;
@@
-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;
}
@@
-644,6
+646,7
@@
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,
0,
NULL,
UNIT(s)->id,
0,
NULL,
@@
-676,6
+679,8
@@
static void swap_enter_dead(Swap *s, SwapResult f) {
exec_runtime_destroy(s->exec_runtime);
s->exec_runtime = exec_runtime_unref(s->exec_runtime);
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);
}
@@
-712,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;
@@
-1266,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;