chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
execute: if the main process of a service already owns the TTY, don't wait for acquir...
[elogind.git]
/
src
/
execute.c
diff --git
a/src/execute.c
b/src/execute.c
index 9ded1c77882cd3e5750f3f8cb348eedeb6ffbc3b..138d38817fef92945040b64ad66217344c8dd463 100644
(file)
--- a/
src/execute.c
+++ b/
src/execute.c
@@
-197,7
+197,7
@@
static int connect_logger_as(const ExecContext *context, ExecOutput output, cons
output == EXEC_OUTPUT_KMSG ? "kmsg" : "syslog",
context->syslog_priority,
context->syslog_identifier ? context->syslog_identifier : ident,
output == EXEC_OUTPUT_KMSG ? "kmsg" : "syslog",
context->syslog_priority,
context->syslog_identifier ? context->syslog_identifier : ident,
-
!context->syslog_no
_prefix);
+
context->syslog_level
_prefix);
if (fd != nfd) {
r = dup2(fd, nfd) < 0 ? -errno : nfd;
if (fd != nfd) {
r = dup2(fd, nfd) < 0 ? -errno : nfd;
@@
-232,7
+232,10
@@
static bool is_terminal_input(ExecInput i) {
i == EXEC_INPUT_TTY_FAIL;
}
i == EXEC_INPUT_TTY_FAIL;
}
-static int fixup_input(ExecInput std_input, int socket_fd) {
+static int fixup_input(ExecInput std_input, int socket_fd, bool apply_tty_stdin) {
+
+ if (is_terminal_input(std_input) && !apply_tty_stdin)
+ return EXEC_INPUT_NULL;
if (std_input == EXEC_INPUT_SOCKET && socket_fd < 0)
return EXEC_INPUT_NULL;
if (std_input == EXEC_INPUT_SOCKET && socket_fd < 0)
return EXEC_INPUT_NULL;
@@
-248,12
+251,12
@@
static int fixup_output(ExecOutput std_output, int socket_fd) {
return std_output;
}
return std_output;
}
-static int setup_input(const ExecContext *context, int socket_fd) {
+static int setup_input(const ExecContext *context, int socket_fd
, bool apply_tty_stdin
) {
ExecInput i;
assert(context);
ExecInput i;
assert(context);
- i = fixup_input(context->std_input, socket_fd);
+ i = fixup_input(context->std_input, socket_fd
, apply_tty_stdin
);
switch (i) {
switch (i) {
@@
-289,14
+292,14
@@
static int setup_input(const ExecContext *context, int socket_fd) {
}
}
}
}
-static int setup_output(const ExecContext *context, int socket_fd, const char *ident) {
+static int setup_output(const ExecContext *context, int socket_fd, const char *ident
, bool apply_tty_stdin
) {
ExecOutput o;
ExecInput i;
assert(context);
assert(ident);
ExecOutput o;
ExecInput i;
assert(context);
assert(ident);
- i = fixup_input(context->std_input, socket_fd);
+ i = fixup_input(context->std_input, socket_fd
, apply_tty_stdin
);
o = fixup_output(context->std_output, socket_fd);
/* This expects the input is already set up */
o = fixup_output(context->std_output, socket_fd);
/* This expects the input is already set up */
@@
-305,16
+308,16
@@
static int setup_output(const ExecContext *context, int socket_fd, const char *i
case EXEC_OUTPUT_INHERIT:
case EXEC_OUTPUT_INHERIT:
- /* If the input is connected to a
termina
l, inherit that... */
+ /* If the input is connected to a
nything that's not a /dev/nul
l, inherit that... */
if (i != EXEC_INPUT_NULL)
return dup2(STDIN_FILENO, STDOUT_FILENO) < 0 ? -errno : STDOUT_FILENO;
if (i != EXEC_INPUT_NULL)
return dup2(STDIN_FILENO, STDOUT_FILENO) < 0 ? -errno : STDOUT_FILENO;
- /* For PID 1 stdout is always connected to /dev/null,
- * hence reopen the console if out parent is PID1. */
- if (getppid() == 1)
- return open_terminal_as(tty_path(context), O_WRONLY, STDOUT_FILENO);
+ /* If we are not started from PID 1 we just inherit STDOUT from our parent process. */
+ if (getppid() != 1)
+ return STDOUT_FILENO;
- return STDOUT_FILENO;
+ /* We need to open /dev/null here anew, to get the
+ * right access mode. So we fall through */
case EXEC_OUTPUT_NULL:
return open_null_as(O_WRONLY, STDOUT_FILENO);
case EXEC_OUTPUT_NULL:
return open_null_as(O_WRONLY, STDOUT_FILENO);
@@
-339,14
+342,14
@@
static int setup_output(const ExecContext *context, int socket_fd, const char *i
}
}
}
}
-static int setup_error(const ExecContext *context, int socket_fd, const char *ident) {
+static int setup_error(const ExecContext *context, int socket_fd, const char *ident
, bool apply_tty_stdin
) {
ExecOutput o, e;
ExecInput i;
assert(context);
assert(ident);
ExecOutput o, e;
ExecInput i;
assert(context);
assert(ident);
- i = fixup_input(context->std_input, socket_fd);
+ i = fixup_input(context->std_input, socket_fd
, apply_tty_stdin
);
o = fixup_output(context->std_output, socket_fd);
e = fixup_output(context->std_error, socket_fd);
o = fixup_output(context->std_output, socket_fd);
e = fixup_output(context->std_error, socket_fd);
@@
-356,7
+359,7
@@
static int setup_error(const ExecContext *context, int socket_fd, const char *id
* the way and are not on a tty */
if (e == EXEC_OUTPUT_INHERIT &&
o == EXEC_OUTPUT_INHERIT &&
* the way and are not on a tty */
if (e == EXEC_OUTPUT_INHERIT &&
o == EXEC_OUTPUT_INHERIT &&
- i
!
= EXEC_INPUT_NULL &&
+ i
=
= EXEC_INPUT_NULL &&
getppid () != 1)
return STDERR_FILENO;
getppid () != 1)
return STDERR_FILENO;
@@
-889,6
+892,7
@@
int exec_spawn(ExecCommand *command,
char **environment,
bool apply_permissions,
bool apply_chroot,
char **environment,
bool apply_permissions,
bool apply_chroot,
+ bool apply_tty_stdin,
bool confirm_spawn,
CGroupBonding *cgroup_bondings,
pid_t *ret) {
bool confirm_spawn,
CGroupBonding *cgroup_bondings,
pid_t *ret) {
@@
-964,7
+968,7
@@
int exec_spawn(ExecCommand *command,
goto fail;
}
goto fail;
}
- if (!context->
no_setsid
)
+ if (!context->
same_pgrp
)
if (setsid() < 0) {
r = EXIT_SETSID;
goto fail;
if (setsid() < 0) {
r = EXIT_SETSID;
goto fail;
@@
-985,7
+989,9
@@
int exec_spawn(ExecCommand *command,
}
}
}
}
- if (confirm_spawn) {
+ /* We skip the confirmation step if we shall not apply the TTY */
+ if (confirm_spawn &&
+ (!is_terminal_input(context->std_input) || apply_tty_stdin)) {
char response;
/* Set up terminal for the question */
char response;
/* Set up terminal for the question */
@@
-1018,18
+1024,18
@@
int exec_spawn(ExecCommand *command,
}
if (!keep_stdin)
}
if (!keep_stdin)
- if (setup_input(context, socket_fd) < 0) {
+ if (setup_input(context, socket_fd
, apply_tty_stdin
) < 0) {
r = EXIT_STDIN;
goto fail;
}
if (!keep_stdout)
r = EXIT_STDIN;
goto fail;
}
if (!keep_stdout)
- if (setup_output(context, socket_fd, file_name_from_path(command->path)) < 0) {
+ if (setup_output(context, socket_fd, file_name_from_path(command->path)
, apply_tty_stdin
) < 0) {
r = EXIT_STDOUT;
goto fail;
}
r = EXIT_STDOUT;
goto fail;
}
- if (setup_error(context, socket_fd, file_name_from_path(command->path)) < 0) {
+ if (setup_error(context, socket_fd, file_name_from_path(command->path)
, apply_tty_stdin
) < 0) {
r = EXIT_STDERR;
goto fail;
}
r = EXIT_STDERR;
goto fail;
}
@@
-1071,8
+1077,8
@@
int exec_spawn(ExecCommand *command,
}
}
}
}
- if (context->cpu
_affinity_
set)
- if (sched_setaffinity(0,
sizeof(context->cpu_affinity), &context->cpu_affinity
) < 0) {
+ if (context->cpuset)
+ if (sched_setaffinity(0,
CPU_ALLOC_SIZE(context->cpuset_ncpus), context->cpuset
) < 0) {
r = EXIT_CPUAFFINITY;
goto fail;
}
r = EXIT_CPUAFFINITY;
goto fail;
}
@@
-1083,8
+1089,8
@@
int exec_spawn(ExecCommand *command,
goto fail;
}
goto fail;
}
- if (context->timer_slack_ns_set)
- if (prctl(PR_SET_TIMERSLACK, context->timer_slack_ns
_set
) < 0) {
+ if (context->timer_slack_ns
ec
_set)
+ if (prctl(PR_SET_TIMERSLACK, context->timer_slack_ns
ec
) < 0) {
r = EXIT_TIMERSLACK;
goto fail;
}
r = EXIT_TIMERSLACK;
goto fail;
}
@@
-1281,8
+1287,7
@@
int exec_spawn(ExecCommand *command,
log_debug("Forked %s as %lu", command->path, (unsigned long) pid);
log_debug("Forked %s as %lu", command->path, (unsigned long) pid);
- command->exec_status.pid = pid;
- dual_timestamp_get(&command->exec_status.start_timestamp);
+ exec_status_start(&command->exec_status, pid);
*ret = pid;
return 0;
*ret = pid;
return 0;
@@
-1295,6
+1300,7
@@
void exec_context_init(ExecContext *c) {
c->ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 0);
c->cpu_sched_policy = SCHED_OTHER;
c->syslog_priority = LOG_DAEMON|LOG_INFO;
c->ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 0);
c->cpu_sched_policy = SCHED_OTHER;
c->syslog_priority = LOG_DAEMON|LOG_INFO;
+ c->syslog_level_prefix = true;
c->mount_flags = MS_SHARED;
}
c->mount_flags = MS_SHARED;
}
@@
-1350,6
+1356,9
@@
void exec_context_done(ExecContext *c) {
strv_free(c->inaccessible_dirs);
c->inaccessible_dirs = NULL;
strv_free(c->inaccessible_dirs);
c->inaccessible_dirs = NULL;
+
+ if (c->cpuset)
+ CPU_FREE(c->cpuset);
}
void exec_command_done(ExecCommand *c) {
}
void exec_command_done(ExecCommand *c) {
@@
-1458,16
+1467,16
@@
void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
prefix, c->cpu_sched_priority,
prefix, yes_no(c->cpu_sched_reset_on_fork));
prefix, c->cpu_sched_priority,
prefix, yes_no(c->cpu_sched_reset_on_fork));
- if (c->cpu
_affinity_
set) {
+ if (c->cpuset) {
fprintf(f, "%sCPUAffinity:", prefix);
fprintf(f, "%sCPUAffinity:", prefix);
- for (i = 0; i <
CPU_SETSIZE
; i++)
- if (CPU_ISSET
(i, &c->cpu_affinity
))
+ for (i = 0; i <
c->cpuset_ncpus
; i++)
+ if (CPU_ISSET
_S(i, CPU_ALLOC_SIZE(c->cpuset_ncpus), c->cpuset
))
fprintf(f, " %i", i);
fputs("\n", f);
}
fprintf(f, " %i", i);
fputs("\n", f);
}
- if (c->timer_slack_ns_set)
- fprintf(f, "%sTimerSlackNS
: %lu\n", prefix, c->timer_slack_ns
);
+ if (c->timer_slack_ns
ec
_set)
+ fprintf(f, "%sTimerSlackNS
ec: %lu\n", prefix, c->timer_slack_nsec
);
fprintf(f,
"%sStandardInput: %s\n"
fprintf(f,
"%sStandardInput: %s\n"
@@
-1558,9
+1567,21
@@
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
) {
assert(s);
assert(s);
+ zero(*s);
+ s->pid = pid;
+ dual_timestamp_get(&s->start_timestamp);
+}
+
+void exec_status_exit(ExecStatus *s, pid_t pid, int code, int status) {
+ assert(s);
+
+ if ((s->pid && s->pid != pid) ||
+ !s->start_timestamp.realtime <= 0)
+ zero(*s);
+
s->pid = pid;
dual_timestamp_get(&s->exit_timestamp);
s->pid = pid;
dual_timestamp_get(&s->exit_timestamp);
~ianmdlvl / elogind.git / blobdiff