summaryrefslogtreecommitdiff
path: root/execute.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-01-30 01:55:42 +0100
committerLennart Poettering <lennart@poettering.net>2010-01-30 01:55:42 +0100
commit94f043472a5af62dc9cd5767e89ba33872212d5e (patch)
tree282af9c7e9af74fd54219f5847a9db6ed202c3a1 /execute.h
parent79d6d8160834fdfc964f4b8b2a6b7fb32c7b36c9 (diff)
greatly extend what we enforce as process properties
Diffstat (limited to 'execute.h')
-rw-r--r--execute.h52
1 files changed, 42 insertions, 10 deletions
diff --git a/execute.h b/execute.h
index 581736d0f5..fff54b120e 100644
--- a/execute.h
+++ b/execute.h
@@ -12,6 +12,7 @@ typedef struct ExecContext ExecContext;
#include <sys/capability.h>
#include <stdbool.h>
#include <stdio.h>
+#include <sched.h>
#include "list.h"
#include "util.h"
@@ -20,12 +21,21 @@ typedef struct ExecContext ExecContext;
#define LOGGER_SOCKET "/systemd/logger"
typedef enum ExecOutput {
- EXEC_CONSOLE,
- EXEC_NULL,
- EXEC_SYSLOG,
- EXEC_KERNEL
+ EXEC_OUTPUT_CONSOLE,
+ EXEC_OUTPUT_NULL,
+ EXEC_OUTPUT_SYSLOG,
+ EXEC_OUTPUT_KERNEL,
+ _EXEC_OUTPUT_MAX,
+ _EXEC_OUTPUT_INVALID = -1
} ExecOutput;
+typedef enum ExecInput {
+ EXEC_INPUT_NULL,
+ EXEC_INPUT_CONSOLE,
+ _EXEC_INPUT_MAX,
+ _EXEC_INPUT_INVALID = -1
+} ExecInput;
+
struct ExecStatus {
pid_t pid;
usec_t timestamp;
@@ -43,27 +53,37 @@ struct ExecCommand {
struct ExecContext {
char **environment;
mode_t umask;
- struct rlimit *rlimit[RLIMIT_NLIMITS]; /* FIXME: load-fragment parser missing */
+ struct rlimit *rlimit[RLIMIT_NLIMITS];
char *working_directory, *root_directory;
int oom_adjust;
int nice;
int ioprio;
+ int cpu_sched_policy;
+ int cpu_sched_priority;
+ cpu_set_t cpu_affinity;
+ unsigned long timer_slack_ns;
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;
+ ExecInput input;
ExecOutput output;
int syslog_priority;
char *syslog_identifier;
- /* FIXME: all privs related settings need parser and enforcer */
+ /* FIXME: all privs related settings need to be enforced */
cap_t capabilities;
- bool capabilities_set:1;
+ int secure_bits;
+ uint64_t capability_bounding_set_drop;
- /* since resolving these names might might involve socket
+ /* Since resolving these names might might involve socket
* connections and we don't want to deadlock ourselves these
- * names are resolved on execution only. */
+ * names are resolved on execution only and in the child
+ * process. */
char *user;
char *group;
char **supplementary_groups;
@@ -82,6 +102,7 @@ typedef enum ExitStatus {
/* The LSB suggests that error codes >= 200 are "reserved". We
* use them here under the assumption that they hence are
* unused by init scripts.
+ * c->
*
* http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html */
@@ -93,10 +114,15 @@ typedef enum ExitStatus {
EXIT_LIMITS,
EXIT_OOM_ADJUST,
EXIT_SIGNAL_MASK,
+ EXIT_INPUT,
EXIT_OUTPUT,
EXIT_CHROOT,
EXIT_PGID,
- EXIT_IOPRIO
+ EXIT_IOPRIO,
+ EXIT_TIMERSLACK,
+ EXIT_SECUREBITS,
+ EXIT_SETSCHEDULER,
+ EXIT_CPUAFFINITY
} ExitStatus;
int exec_spawn(const ExecCommand *command, const ExecContext *context, int *fds, unsigned n_fds, pid_t *ret);
@@ -114,4 +140,10 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix);
void exec_status_fill(ExecStatus *s, pid_t pid, int code, int status);
+const char* exec_output_to_string(ExecOutput i);
+int exec_output_from_string(const char *s);
+
+const char* exec_input_to_string(ExecInput i);
+int exec_input_from_string(const char *s);
+
#endif