aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-11-20 10:56:20 -0800
committerRoland McGrath <roland@hack.frob.com>2014-11-20 10:56:20 -0800
commitf214ff74f46275f6f1187730ac88b8a2407393f3 (patch)
treedbbb3206b1a977022e7c53920ad0744f530f8234
parente37c91d4196f116d826cab129ca2637bd367b35e (diff)
downloadglibc-f214ff74f46275f6f1187730ac88b8a2407393f3.tar
glibc-f214ff74f46275f6f1187730ac88b8a2407393f3.tar.gz
glibc-f214ff74f46275f6f1187730ac88b8a2407393f3.tar.bz2
glibc-f214ff74f46275f6f1187730ac88b8a2407393f3.zip
NPTL: Refactor scheduler setup in pthread_create.
-rw-r--r--ChangeLog8
-rw-r--r--nptl/default-sched.h35
-rw-r--r--nptl/pthread_create.c21
-rw-r--r--sysdeps/unix/sysv/linux/default-sched.h42
4 files changed, 91 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 8de1641e3a..23c2244fff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-11-20 Roland McGrath <roland@hack.frob.com>
+
+ * nptl/default-sched.h: New file.
+ * sysdeps/unix/sysv/linux/default-sched.h: New file.
+ * nptl/pthread_create.c: Include it.
+ (__pthread_create_2_1): Use collect_default_sched instead of making
+ Linux syscalls here directly.
+
2014-11-20 Torvald Riegel <triegel@redhat.com>
* nptl/pthread_once.c (clear_once_control, __pthread_once_slow,
diff --git a/nptl/default-sched.h b/nptl/default-sched.h
new file mode 100644
index 0000000000..fb33e7ccb2
--- /dev/null
+++ b/nptl/default-sched.h
@@ -0,0 +1,35 @@
+/* Determine calling thread's scheduling parameters. Stub version.
+ Copyright (C) 2014 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If
+ not, see <http://www.gnu.org/licenses/>. */
+
+#include <assert.h>
+
+/* This should fill in PD->schedpolicy if PD->flags does not contain
+ ATTR_FLAG_POLICY_SET, and set it; and PD->schedparam if PD->flags does
+ not contain ATTR_FLAG_SCHED_SET, and set it. It won't be called at all
+ if both bits are already set. */
+
+static void
+collect_default_sched (struct pthread *pd)
+{
+ assert ((pd->flags & (ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET)) != 0);
+
+ /* The generic/stub version is a no-op rather than just using the
+ __sched_getscheduler and __sched_getparam functions so that there
+ won't be stub warnings for those functions just because pthread_create
+ was called without actually calling those. */
+}
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index 1dd1b951c0..3d4b8cd94e 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -30,6 +30,7 @@
#include <resolv.h>
#include <kernel-features.h>
#include <exit-thread.h>
+#include <default-sched.h>
#include <shlib-compat.h>
@@ -593,26 +594,16 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg)
if (__builtin_expect ((iattr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0, 0)
&& (iattr->flags & (ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET)) != 0)
{
- INTERNAL_SYSCALL_DECL (scerr);
-
/* Use the scheduling parameters the user provided. */
if (iattr->flags & ATTR_FLAG_POLICY_SET)
pd->schedpolicy = iattr->schedpolicy;
- else if ((pd->flags & ATTR_FLAG_POLICY_SET) == 0)
- {
- pd->schedpolicy = INTERNAL_SYSCALL (sched_getscheduler, scerr, 1, 0);
- pd->flags |= ATTR_FLAG_POLICY_SET;
- }
-
if (iattr->flags & ATTR_FLAG_SCHED_SET)
/* The values were validated in pthread_attr_setschedparam. */
- memcpy (&pd->schedparam, &iattr->schedparam,
- sizeof (struct sched_param));
- else if ((pd->flags & ATTR_FLAG_SCHED_SET) == 0)
- {
- INTERNAL_SYSCALL (sched_getparam, scerr, 2, 0, &pd->schedparam);
- pd->flags |= ATTR_FLAG_SCHED_SET;
- }
+ pd->schedparam = iattr->schedparam;
+
+ if ((pd->flags & (ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET))
+ != (ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET))
+ collect_default_sched (pd);
}
/* Pass the descriptor to the caller. */
diff --git a/sysdeps/unix/sysv/linux/default-sched.h b/sysdeps/unix/sysv/linux/default-sched.h
new file mode 100644
index 0000000000..c25778fde8
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/default-sched.h
@@ -0,0 +1,42 @@
+/* Determine calling thread's scheduling parameters. Linux version.
+ Copyright (C) 2014 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If
+ not, see <http://www.gnu.org/licenses/>. */
+
+#include <sysdep.h>
+
+/* This should fill in PD->schedpolicy if PD->flags does not contain
+ ATTR_FLAG_POLICY_SET, and set it; and PD->schedparam if PD->flags does
+ not contain ATTR_FLAG_SCHED_SET, and set it. It won't be called at all
+ if both bits are already set. */
+
+static void
+collect_default_sched (struct pthread *pd)
+{
+ INTERNAL_SYSCALL_DECL (scerr);
+
+ if ((pd->flags & ATTR_FLAG_POLICY_SET) == 0)
+ {
+ pd->schedpolicy = INTERNAL_SYSCALL (sched_getscheduler, scerr, 1, 0);
+ pd->flags |= ATTR_FLAG_POLICY_SET;
+ }
+
+ if ((pd->flags & ATTR_FLAG_SCHED_SET) == 0)
+ {
+ INTERNAL_SYSCALL (sched_getparam, scerr, 2, 0, &pd->schedparam);
+ pd->flags |= ATTR_FLAG_SCHED_SET;
+ }
+}