X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fexecute.h;h=5143fcaa5899ea1de5b794387807ddf6de2f3e7a;hb=613b411c947635136637f8cdd66b94512f761eab;hp=368c9f00bb7e1e6fa07581f69b59d392be504f2c;hpb=df41776d66b5b7467a5cf9c719b97b66d6534c8c;p=elogind.git diff --git a/src/core/execute.h b/src/core/execute.h index 368c9f00b..5143fcaa5 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -24,6 +24,7 @@ typedef struct ExecStatus ExecStatus; typedef struct ExecCommand ExecCommand; typedef struct ExecContext ExecContext; +typedef struct ExecRuntime ExecRuntime; #include #include @@ -35,6 +36,7 @@ typedef struct ExecContext ExecContext; #include "list.h" #include "util.h" +#include "fdset.h" typedef struct Unit Unit; @@ -79,6 +81,15 @@ struct ExecCommand { bool ignore; }; +struct ExecRuntime { + int n_ref; + + char *tmp_dir; + char *var_tmp_dir; + + int netns_storage_socket[2]; +}; + struct ExecContext { char **environment; char **environment_files; @@ -140,8 +151,6 @@ struct ExecContext { bool non_blocking; bool private_tmp; bool private_network; - char *tmp_dir; - char *var_tmp_dir; bool no_new_privileges; @@ -175,6 +184,7 @@ int exec_spawn(ExecCommand *command, const char *cgroup_path, const char *unit_id, int pipe_fd[2], + ExecRuntime *runtime, pid_t *ret); void exec_command_done(ExecCommand *c); @@ -191,19 +201,26 @@ void exec_command_append_list(ExecCommand **l, ExecCommand *e); int exec_command_set(ExecCommand *c, const char *path, ...); void exec_context_init(ExecContext *c); -void exec_context_done(ExecContext *c, bool reloading_or_reexecuting); -void exec_context_tmp_dirs_done(ExecContext *c); +void exec_context_done(ExecContext *c); void exec_context_dump(ExecContext *c, FILE* f, const char *prefix); int exec_context_load_environment(const ExecContext *c, char ***l); bool exec_context_may_touch_console(ExecContext *c); -void exec_context_serialize(const ExecContext *c, Unit *u, FILE *f); 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); +int exec_runtime_make(ExecRuntime **rt, ExecContext *c, const char *id); +ExecRuntime *exec_runtime_ref(ExecRuntime *r); +ExecRuntime *exec_runtime_unref(ExecRuntime *r); + +int exec_runtime_serialize(ExecRuntime *rt, Unit *u, FILE *f, FDSet *fds); +int exec_runtime_deserialize_item(ExecRuntime **rt, Unit *u, const char *key, const char *value, FDSet *fds); + +void exec_runtime_destroy(ExecRuntime *rt); + const char* exec_output_to_string(ExecOutput i) _const_; ExecOutput exec_output_from_string(const char *s) _pure_;