X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=execute.c;h=ed6ad7f6e2eaad3b617871ae6665a5cd100a8141;hb=09a3bb9302e3c2562648e9a1ce7b2c800249852a;hp=ae32bcadac53f871a485729eb19b6b097a06323d;hpb=ea4309869e75497ba6a97c540646cb66a157a4d9;p=elogind.git
diff --git a/execute.c b/execute.c
index ae32bcada..ed6ad7f6e 100644
--- a/execute.c
+++ b/execute.c
@@ -1,5 +1,24 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see .
+***/
+
#include
#include
#include
@@ -10,7 +29,7 @@
#include
#include
#include
-#include
+#include
#include "execute.h"
#include "strv.h"
@@ -248,7 +267,7 @@ static int setup_output(const ExecContext *context, const char *ident) {
}
}
-int setup_input(const ExecContext *context) {
+static int setup_input(const ExecContext *context) {
int r;
assert(context);
@@ -347,7 +366,8 @@ int exec_spawn(const ExecCommand *command, const ExecContext *context, int *fds,
zero(param);
param.sched_priority = context->cpu_sched_priority;
- if (sched_setscheduler(0, context->cpu_sched_policy, ¶m) < 0) {
+ if (sched_setscheduler(0, context->cpu_sched_policy |
+ (context->cpu_sched_reset_on_fork ? SCHED_RESET_ON_FORK : 0), ¶m) < 0) {
r = EXIT_SETSCHEDULER;
goto fail;
}
@@ -563,9 +583,11 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
if (c->cpu_sched_set)
fprintf(f,
"%sCPUSchedulingPolicy: %s\n"
- "%sCPUSchedulingPriority: %i\n",
+ "%sCPUSchedulingPriority: %i\n"
+ "%sCPUSchedulingResetOnFork: %s\n",
prefix, sched_policy_to_string(c->cpu_sched_policy),
- prefix, c->cpu_sched_priority);
+ prefix, c->cpu_sched_priority,
+ prefix, yes_no(c->cpu_sched_reset_on_fork));
if (c->cpu_affinity_set) {
fprintf(f, "%sCPUAffinity:", prefix);