X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fexecute.h;h=187e8d22742fc6aefe858608bb3f2703b9720bee;hp=d42e0ba9d97cb3eca8da2c619ddaa695b39f6e10;hb=706343f492725fe430879c5d4a3485d7c49b0601;hpb=9a6bca7aada334cdcf10ae8e526de1f7f581da4f diff --git a/src/execute.h b/src/execute.h index d42e0ba9d..187e8d227 100644 --- a/src/execute.h +++ b/src/execute.h @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ #ifndef fooexecutehfoo #define fooexecutehfoo @@ -26,6 +26,7 @@ typedef struct ExecStatus ExecStatus; typedef struct ExecCommand ExecCommand; typedef struct ExecContext ExecContext; +#include #include #include #include @@ -34,12 +35,26 @@ typedef struct ExecContext ExecContext; #include struct CGroupBonding; +struct CGroupAttribute; #include "list.h" #include "util.h" -/* Abstract namespace! */ -#define LOGGER_SOCKET "/org/freedesktop/systemd1/logger" +typedef enum KillMode { + KILL_CONTROL_GROUP = 0, + KILL_PROCESS, + KILL_NONE, + _KILL_MODE_MAX, + _KILL_MODE_INVALID = -1 +} KillMode; + +typedef enum KillWho { + KILL_MAIN, + KILL_CONTROL, + KILL_ALL, + _KILL_WHO_MAX, + _KILL_WHO_INVALID = -1 +} KillWho; typedef enum ExecInput { EXEC_INPUT_NULL, @@ -56,15 +71,19 @@ typedef enum ExecOutput { EXEC_OUTPUT_NULL, EXEC_OUTPUT_TTY, EXEC_OUTPUT_SYSLOG, + EXEC_OUTPUT_SYSLOG_AND_CONSOLE, EXEC_OUTPUT_KMSG, + EXEC_OUTPUT_KMSG_AND_CONSOLE, + EXEC_OUTPUT_JOURNAL, + EXEC_OUTPUT_JOURNAL_AND_CONSOLE, EXEC_OUTPUT_SOCKET, _EXEC_OUTPUT_MAX, _EXEC_OUTPUT_INVALID = -1 } ExecOutput; struct ExecStatus { - usec_t start_timestamp; - usec_t exit_timestamp; + dual_timestamp start_timestamp; + dual_timestamp exit_timestamp; pid_t pid; int code; /* as in siginfo_t::si_code */ int status; /* as in sigingo_t::si_status */ @@ -75,33 +94,40 @@ struct ExecCommand { char **argv; ExecStatus exec_status; LIST_FIELDS(ExecCommand, command); /* useful for chaining commands */ + bool ignore; }; struct ExecContext { char **environment; + char **environment_files; + struct rlimit *rlimit[RLIMIT_NLIMITS]; char *working_directory, *root_directory; mode_t umask; - int oom_adjust; + int oom_score_adjust; int nice; int ioprio; int cpu_sched_policy; int cpu_sched_priority; - cpu_set_t cpu_affinity; - unsigned long timer_slack_ns; + cpu_set_t *cpuset; + unsigned cpuset_ncpus; ExecInput std_input; ExecOutput std_output; ExecOutput std_error; - int syslog_priority; - char *syslog_identifier; - bool syslog_no_prefix; + unsigned long timer_slack_nsec; + + char *tcpwrap_name; char *tty_path; + bool tty_reset; + bool tty_vhangup; + bool tty_vt_disallocate; + /* Since resolving these names might might involve socket * connections and we don't want to deadlock ourselves these * names are resolved on execution only and in the child @@ -110,74 +136,47 @@ struct ExecContext { char *group; char **supplementary_groups; + char *pam_name; + + char *utmp_id; + char **read_write_dirs, **read_only_dirs, **inaccessible_dirs; unsigned long mount_flags; uint64_t capability_bounding_set_drop; + /* Not relevant for spawning processes, just for killing */ + KillMode kill_mode; + int kill_signal; + bool send_sigkill; + cap_t capabilities; int secure_bits; + int syslog_priority; + char *syslog_identifier; + bool syslog_level_prefix; + bool cpu_sched_reset_on_fork; bool non_blocking; bool private_tmp; + bool private_network; - bool oom_adjust_set:1; - bool nice_set:1; - bool ioprio_set:1; - bool cpu_sched_set:1; - bool cpu_affinity_set:1; - bool timer_slack_ns_set:1; + bool control_group_modify; /* This is not exposed to the user but available * internally. We need it to make sure that whenever we spawn * /bin/mount it is run in the same process group as us so * that the autofs logic detects that it belongs to us and we * don't enter a trigger loop. */ - bool no_setsid:1; -}; + bool same_pgrp; -typedef enum ExitStatus { - /* EXIT_SUCCESS defined by libc */ - /* EXIT_FAILURE defined by libc */ - EXIT_INVALIDARGUMENT = 2, - EXIT_NOTIMPLEMENTED = 3, - EXIT_NOPERMISSION = 4, - EXIT_NOTINSTALLED = 5, - EXIT_NOTCONFIGURED = 6, - EXIT_NOTRUNNING = 7, - - /* The LSB suggests that error codes >= 200 are "reserved". We - * use them here under the assumption that they hence are - * unused by init scripts. - * - * http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html */ - - EXIT_CHDIR = 200, - EXIT_NICE, - EXIT_FDS, - EXIT_EXEC, - EXIT_MEMORY, - EXIT_LIMITS, - EXIT_OOM_ADJUST, - EXIT_SIGNAL_MASK, - EXIT_STDIN, - EXIT_STDOUT, - EXIT_CHROOT, /* 210 */ - EXIT_IOPRIO, - EXIT_TIMERSLACK, - EXIT_SECUREBITS, - EXIT_SETSCHEDULER, - EXIT_CPUAFFINITY, - EXIT_GROUP, - EXIT_USER, - EXIT_CAPABILITIES, - EXIT_CGROUP, - EXIT_SETSID, /* 220 */ - EXIT_CONFIRM, - EXIT_STDERR - -} ExitStatus; + bool oom_score_adjust_set:1; + bool nice_set:1; + bool ioprio_set:1; + bool cpu_sched_set:1; + bool timer_slack_nsec_set:1; +}; int exec_spawn(ExecCommand *command, char **argv, @@ -186,8 +185,10 @@ int exec_spawn(ExecCommand *command, char **environment, bool apply_permissions, bool apply_chroot, + bool apply_tty_stdin, bool confirm_spawn, struct CGroupBonding *cgroup_bondings, + struct CGroupAttribute *cgroup_attributes, pid_t *ret); void exec_command_done(ExecCommand *c); @@ -206,16 +207,24 @@ int exec_command_set(ExecCommand *c, const char *path, ...); void exec_context_init(ExecContext *c); void exec_context_done(ExecContext *c); void exec_context_dump(ExecContext *c, FILE* f, const char *prefix); +void exec_context_tty_reset(const ExecContext *context); -void exec_status_fill(ExecStatus *s, pid_t pid, int code, int status); +int exec_context_load_environment(const ExecContext *c, char ***l); + +void exec_status_start(ExecStatus *s, pid_t pid); +void exec_status_exit(ExecStatus *s, ExecContext *context, pid_t pid, int code, int status); void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix); const char* exec_output_to_string(ExecOutput i); -int exec_output_from_string(const char *s); +ExecOutput exec_output_from_string(const char *s); const char* exec_input_to_string(ExecInput i); -int exec_input_from_string(const char *s); +ExecInput exec_input_from_string(const char *s); + +const char *kill_mode_to_string(KillMode k); +KillMode kill_mode_from_string(const char *s); -const char* exit_status_to_string(ExitStatus status); +const char *kill_who_to_string(KillWho k); +KillWho kill_who_from_string(const char *s); #endif