chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
turn negative options into positive options
[elogind.git]
/
src
/
execute.h
diff --git
a/src/execute.h
b/src/execute.h
index be73542d4b02345d46244630d79f13d5272b110c..2e0e6cca3c7bc7f983f5d59cc8e83ea2b05bb1fc 100644
(file)
--- a/
src/execute.h
+++ b/
src/execute.h
@@
-41,6
+41,10
@@
struct CGroupBonding;
/* Abstract namespace! */
#define LOGGER_SOCKET "/org/freedesktop/systemd1/logger"
/* Abstract namespace! */
#define LOGGER_SOCKET "/org/freedesktop/systemd1/logger"
+/* This doesn't really belong here, but I couldn't find a better place to put this. */
+#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
+#define SIGNALS_IGNORE SIGKILL,SIGPIPE
+
typedef enum ExecInput {
EXEC_INPUT_NULL,
EXEC_INPUT_TTY,
typedef enum ExecInput {
EXEC_INPUT_NULL,
EXEC_INPUT_TTY,
@@
-56,15
+60,15
@@
typedef enum ExecOutput {
EXEC_OUTPUT_NULL,
EXEC_OUTPUT_TTY,
EXEC_OUTPUT_SYSLOG,
EXEC_OUTPUT_NULL,
EXEC_OUTPUT_TTY,
EXEC_OUTPUT_SYSLOG,
- EXEC_OUTPUT_K
ERNEL
,
+ EXEC_OUTPUT_K
MSG
,
EXEC_OUTPUT_SOCKET,
_EXEC_OUTPUT_MAX,
_EXEC_OUTPUT_INVALID = -1
} ExecOutput;
struct ExecStatus {
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 */
pid_t pid;
int code; /* as in siginfo_t::si_code */
int status; /* as in sigingo_t::si_status */
@@
-89,8
+93,9
@@
struct ExecContext {
int cpu_sched_policy;
int cpu_sched_priority;
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;
+ unsigned long timer_slack_nsec;
ExecInput std_input;
ExecOutput std_output;
ExecInput std_input;
ExecOutput std_output;
@@
-98,7
+103,9
@@
struct ExecContext {
int syslog_priority;
char *syslog_identifier;
int syslog_priority;
char *syslog_identifier;
- bool syslog_no_prefix;
+ bool syslog_level_prefix;
+
+ char *tcpwrap_name;
char *tty_path;
char *tty_path;
@@
-110,6
+117,8
@@
struct ExecContext {
char *group;
char **supplementary_groups;
char *group;
char **supplementary_groups;
+ char *pam_name;
+
char **read_write_dirs, **read_only_dirs, **inaccessible_dirs;
unsigned long mount_flags;
char **read_write_dirs, **read_only_dirs, **inaccessible_dirs;
unsigned long mount_flags;
@@
-126,15
+135,14
@@
struct ExecContext {
bool nice_set:1;
bool ioprio_set:1;
bool cpu_sched_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 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. */
/* 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 {
};
typedef enum ExitStatus {
@@
-175,7
+183,9
@@
typedef enum ExitStatus {
EXIT_CGROUP,
EXIT_SETSID, /* 220 */
EXIT_CONFIRM,
EXIT_CGROUP,
EXIT_SETSID, /* 220 */
EXIT_CONFIRM,
- EXIT_STDERR
+ EXIT_STDERR,
+ EXIT_TCPWRAP,
+ EXIT_PAM
} ExitStatus;
} ExitStatus;
@@
-207,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_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);
void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix);
const char* exec_output_to_string(ExecOutput i);