From 714da1d4eac32400187255254dd40334b48b80f3 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 15 May 2020 11:26:37 +0200 Subject: nptl: Replace some stubs with the Linux implementation The stubs for pthread_getaffinity_np, pthread_getname_np, pthread_setaffinity_np, pthread_setname_np are replaced, and corresponding tests are moved. After the removal of the NaCl port, nptl is Linux-specific, and the stubs are no longer needed. This effectively reverts commit c76d1ff5149bd03210f2bb8cd64446c51618d016 ("NPTL: Add stubs for Linux-only extension functions."). Reviewed-by: Carlos O'Donell --- nptl/pthread_getaffinity.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) (limited to 'nptl/pthread_getaffinity.c') diff --git a/nptl/pthread_getaffinity.c b/nptl/pthread_getaffinity.c index 2ba05b5b92..cf6ecfe01f 100644 --- a/nptl/pthread_getaffinity.c +++ b/nptl/pthread_getaffinity.c @@ -1,6 +1,6 @@ -/* Get the processor affinity of a thread. Stub version. - Copyright (C) 2014-2020 Free Software Foundation, Inc. +/* Copyright (C) 2003-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2003. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,17 +16,43 @@ License along with the GNU C Library; if not, see . */ +#include +#include #include +#include +#include +#include +#include +#include + int -__pthread_getaffinity_np (pthread_t th, size_t cpusetsize, cpu_set_t *cpuset) +__pthread_getaffinity_new (pthread_t th, size_t cpusetsize, cpu_set_t *cpuset) { const struct pthread *pd = (const struct pthread *) th; - if (INVALID_TD_P (pd)) - return ESRCH; + int res = INTERNAL_SYSCALL_CALL (sched_getaffinity, pd->tid, + MIN (INT_MAX, cpusetsize), cpuset); + if (INTERNAL_SYSCALL_ERROR_P (res)) + return INTERNAL_SYSCALL_ERRNO (res); + + /* Clean the rest of the memory the kernel didn't do. */ + memset ((char *) cpuset + res, '\0', cpusetsize - res); + + return 0; +} +strong_alias (__pthread_getaffinity_new, __pthread_getaffinity_np) +versioned_symbol (libpthread, __pthread_getaffinity_new, + pthread_getaffinity_np, GLIBC_2_3_4); - return ENOSYS; + +#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4) +int +__pthread_getaffinity_old (pthread_t th, cpu_set_t *cpuset) +{ + /* The old interface by default assumed a 1024 processor bitmap. */ + return __pthread_getaffinity_new (th, 128, cpuset); } -weak_alias (__pthread_getaffinity_np, pthread_getaffinity_np) -stub_warning (pthread_getaffinity_np) +compat_symbol (libpthread, __pthread_getaffinity_old, pthread_getaffinity_np, + GLIBC_2_3_3); +#endif -- cgit 1.4.1