X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fexecute.h;h=2e0e6cca3c7bc7f983f5d59cc8e83ea2b05bb1fc;hp=9fb48e6446b761460511ddf6802c41384cd55f1b;hb=9a1ac7b9ae2fb218170d1bd106d5351a76d03a95;hpb=82c121a4754a9d405b07c75796e329942af2ccc5 diff --git a/src/execute.h b/src/execute.h index 9fb48e644..2e0e6cca3 100644 --- a/src/execute.h +++ b/src/execute.h @@ -95,7 +95,7 @@ struct ExecContext { cpu_set_t *cpuset; unsigned cpuset_ncpus; - unsigned long timer_slack_ns; + unsigned long timer_slack_nsec; ExecInput std_input; ExecOutput std_output; @@ -103,7 +103,7 @@ struct ExecContext { int syslog_priority; char *syslog_identifier; - bool syslog_no_prefix; + bool syslog_level_prefix; char *tcpwrap_name; @@ -135,14 +135,14 @@ struct ExecContext { bool nice_set:1; bool ioprio_set:1; bool cpu_sched_set:1; - bool timer_slack_ns_set:1; + bool timer_slack_nsec_set:1; /* 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; + bool same_pgrp; }; typedef enum ExitStatus { @@ -217,7 +217,8 @@ 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_status_fill(ExecStatus *s, pid_t pid, int code, int status); +void exec_status_start(ExecStatus *s, pid_t pid); +void exec_status_exit(ExecStatus *s, 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);