diff options
author | Lennart Poettering <lennart@poettering.net> | 2021-10-20 13:14:11 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2021-10-22 16:34:30 +0200 |
commit | 8ddefb8eef412f888b230588ebde832fc50dc781 (patch) | |
tree | 86937d0c715afe03295cc6a10d1cdd447475074f /src/shared | |
parent | 197aec7e79d2f61c50b1684317c11d36968a83f2 (diff) | |
download | systemd-8ddefb8eef412f888b230588ebde832fc50dc781.tar.gz |
basic: move freeze() from shared/exec-util.h to basic/process-util.h
That way we can use it in other code from basic/. It fits into both
headers equally well or badly, hence let's just move this one function.
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/exec-util.c | 23 | ||||
-rw-r--r-- | src/shared/exec-util.h | 2 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c index 042db7db3f..fd0d95c530 100644 --- a/src/shared/exec-util.c +++ b/src/shared/exec-util.c @@ -448,29 +448,6 @@ ExecCommandFlags exec_command_flags_from_string(const char *s) { return 1 << idx; } -_noreturn_ void freeze(void) { - log_close(); - - /* Make sure nobody waits for us on a socket anymore */ - (void) close_all_fds_full(NULL, 0, false); - - sync(); - - /* Let's not freeze right away, but keep reaping zombies. */ - for (;;) { - int r; - siginfo_t si = {}; - - r = waitid(P_ALL, 0, &si, WEXITED); - if (r < 0 && errno != EINTR) - break; - } - - /* waitid() failed with an unexpected error, things are really borked. Freeze now! */ - for (;;) - pause(); -} - int fexecve_or_execve(int executable_fd, const char *executable, char *const argv[], char *const envp[]) { #if ENABLE_FEXECVE execveat(executable_fd, "", argv, envp, AT_EMPTY_PATH); diff --git a/src/shared/exec-util.h b/src/shared/exec-util.h index 05f8e1af83..21d28608f9 100644 --- a/src/shared/exec-util.h +++ b/src/shared/exec-util.h @@ -47,8 +47,6 @@ extern const gather_stdout_callback_t gather_environment[_STDOUT_CONSUME_MAX]; const char* exec_command_flags_to_string(ExecCommandFlags i); ExecCommandFlags exec_command_flags_from_string(const char *s); -_noreturn_ void freeze(void); - int fexecve_or_execve(int executable_fd, const char *executable, char *const argv[], char *const envp[]); int fork_agent(const char *name, int except[], size_t n_except, pid_t *ret_pid, const char *path, ...) _sentinel_; |