aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-01-08 10:49:40 -0800
committerRoland McGrath <roland@hack.frob.com>2015-01-08 10:49:40 -0800
commit59ff172f8064757e2302f9b4fb7583ec2841d591 (patch)
tree18b57d9512d0b8d347e363dae4664063c0240e9f /nptl
parentb92058573b4b26ad0700c73d0ba33a796556e7fa (diff)
downloadglibc-59ff172f8064757e2302f9b4fb7583ec2841d591.zip
glibc-59ff172f8064757e2302f9b4fb7583ec2841d591.tar.gz
glibc-59ff172f8064757e2302f9b4fb7583ec2841d591.tar.bz2
NPTL: Refactor cpu_set_t validation to be sysdeps-controlled
This removes Linuxisms related to cpu_set_t validation from the generic NPTL code and puts them into a new sysdeps header file.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/check-cpuset.h32
-rw-r--r--nptl/pthreadP.h27
-rw-r--r--nptl/pthread_attr_setaffinity.c3
-rw-r--r--nptl/pthread_setattr_default_np.c2
4 files changed, 35 insertions, 29 deletions
diff --git a/nptl/check-cpuset.h b/nptl/check-cpuset.h
new file mode 100644
index 0000000..315bdf2
--- /dev/null
+++ b/nptl/check-cpuset.h
@@ -0,0 +1,32 @@
+/* Validate cpu_set_t values for NPTL. Stub version.
+ Copyright (C) 2015 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 Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <errno.h>
+
+/* Returns 0 if CS and SZ are valid values for the cpuset and cpuset size
+ respectively. Otherwise it returns an error number. */
+static inline int
+check_cpuset_attr (const cpu_set_t *cs, const size_t sz)
+{
+ if (sz == 0)
+ return 0;
+
+ /* This means pthread_attr_setaffinity will return ENOSYS, which
+ is the right thing when the cpu_set_t features are not available. */
+ return ENOSYS;
+}
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 8a3494c..84a7105 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -629,31 +629,4 @@ check_stacksize_attr (size_t st)
return EINVAL;
}
-/* Defined in pthread_setaffinity.c. */
-extern size_t __kernel_cpumask_size attribute_hidden;
-extern int __determine_cpumask_size (pid_t tid);
-
-/* Returns 0 if CS and SZ are valid values for the cpuset and cpuset size
- respectively. Otherwise it returns an error number. */
-static inline int
-check_cpuset_attr (const cpu_set_t *cs, const size_t sz)
-{
- if (__kernel_cpumask_size == 0)
- {
- int res = __determine_cpumask_size (THREAD_SELF->tid);
- if (res)
- return res;
- }
-
- /* Check whether the new bitmask has any bit set beyond the
- last one the kernel accepts. */
- for (size_t cnt = __kernel_cpumask_size; cnt < sz; ++cnt)
- if (((char *) cs)[cnt] != '\0')
- /* Found a nonzero byte. This means the user request cannot be
- fulfilled. */
- return EINVAL;
-
- return 0;
-}
-
#endif /* pthreadP.h */
diff --git a/nptl/pthread_attr_setaffinity.c b/nptl/pthread_attr_setaffinity.c
index a249b41..7a127b8 100644
--- a/nptl/pthread_attr_setaffinity.c
+++ b/nptl/pthread_attr_setaffinity.c
@@ -23,8 +23,7 @@
#include <string.h>
#include <pthreadP.h>
#include <shlib-compat.h>
-
-
+#include <check-cpuset.h>
int
diff --git a/nptl/pthread_setattr_default_np.c b/nptl/pthread_setattr_default_np.c
index 8d5bb71..457a467 100644
--- a/nptl/pthread_setattr_default_np.c
+++ b/nptl/pthread_setattr_default_np.c
@@ -21,6 +21,8 @@
#include <pthreadP.h>
#include <assert.h>
#include <string.h>
+#include <check-cpuset.h>
+
int
pthread_setattr_default_np (const pthread_attr_t *in)