From 541e53c9ddd9ef543cc45b66c7597e63fa665414 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 22 Feb 2021 18:30:52 +0100 Subject: nptl: Move futex-internal.c into main nptl directory Reviewed-by: Adhemerval Zanella --- sysdeps/nptl/Makefile | 3 +- sysdeps/nptl/futex-internal.c | 126 ------------------------------------------ 2 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 sysdeps/nptl/futex-internal.c (limited to 'sysdeps') diff --git a/sysdeps/nptl/Makefile b/sysdeps/nptl/Makefile index bdba75d85f..adcced422b 100644 --- a/sysdeps/nptl/Makefile +++ b/sysdeps/nptl/Makefile @@ -17,8 +17,7 @@ # . ifeq ($(subdir),nptl) -libpthread-sysdep_routines += errno-loc futex-internal -CFLAGS-futex-internal.c += -fexceptions -fasynchronous-unwind-tables +libpthread-sysdep_routines += errno-loc endif ifeq ($(subdir),rt) diff --git a/sysdeps/nptl/futex-internal.c b/sysdeps/nptl/futex-internal.c deleted file mode 100644 index 89b4ba76e9..0000000000 --- a/sysdeps/nptl/futex-internal.c +++ /dev/null @@ -1,126 +0,0 @@ -/* futex helper functions for glibc-internal use. - Copyright (C) 2020-2021 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 - . */ - -#include -#include -#include -#include -#include - -#ifndef __ASSUME_TIME64_SYSCALLS -static int -__futex_abstimed_wait_common32 (unsigned int* futex_word, - unsigned int expected, int op, - const struct __timespec64* abstime, - int private, bool cancel) -{ - struct timespec ts32, *pts32 = NULL; - if (abstime != NULL) - { - if (! in_time_t_range (abstime->tv_sec)) - return -EOVERFLOW; - - ts32 = valid_timespec64_to_timespec (*abstime); - pts32 = &ts32; - } - - if (cancel) - return INTERNAL_SYSCALL_CANCEL (futex, futex_word, op, expected, - pts32, NULL /* Unused. */, - FUTEX_BITSET_MATCH_ANY); - else - return INTERNAL_SYSCALL_CALL (futex, futex_word, op, expected, - pts32, NULL /* Unused. */, - FUTEX_BITSET_MATCH_ANY); -} -#endif /* ! __ASSUME_TIME64_SYSCALLS */ - -static int -__futex_abstimed_wait_common64 (unsigned int* futex_word, - unsigned int expected, clockid_t clockid, - const struct __timespec64* abstime, - int private, bool cancel) -{ - unsigned int clockbit; - int err; - - /* Work around the fact that the kernel rejects negative timeout values - despite them being valid. */ - if (__glibc_unlikely ((abstime != NULL) && (abstime->tv_sec < 0))) - return ETIMEDOUT; - - if (! lll_futex_supported_clockid (clockid)) - return EINVAL; - - clockbit = (clockid == CLOCK_REALTIME) ? FUTEX_CLOCK_REALTIME : 0; - int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit, private); - - if (cancel) - err = INTERNAL_SYSCALL_CANCEL (futex_time64, futex_word, op, expected, - abstime, NULL /* Unused. */, - FUTEX_BITSET_MATCH_ANY); - else - err = INTERNAL_SYSCALL_CALL (futex_time64, futex_word, op, expected, - abstime, NULL /* Ununsed. */, - FUTEX_BITSET_MATCH_ANY); -#ifndef __ASSUME_TIME64_SYSCALLS - if (err == -ENOSYS) - err = __futex_abstimed_wait_common32 (futex_word, expected, op, abstime, - private, cancel); -#endif - - switch (err) - { - case 0: - case -EAGAIN: - case -EINTR: - case -ETIMEDOUT: - case -EINVAL: - case -EOVERFLOW: /* Passed absolute timeout uses 64 bit time_t type, but - underlying kernel does not support 64 bit time_t futex - syscalls. */ - return -err; - - case -EFAULT: /* Must have been caused by a glibc or application bug. */ - case -ENOSYS: /* Must have been caused by a glibc bug. */ - /* No other errors are documented at this time. */ - default: - futex_fatal_error (); - } -} - -int -__futex_abstimed_wait64 (unsigned int* futex_word, unsigned int expected, - clockid_t clockid, - const struct __timespec64* abstime, int private) -{ - return __futex_abstimed_wait_common64 (futex_word, expected, clockid, - abstime, private, false); -} -libpthread_hidden_def (__futex_abstimed_wait64) - -int -__futex_abstimed_wait_cancelable64 (unsigned int* futex_word, - unsigned int expected, clockid_t clockid, - const struct __timespec64* abstime, - int private) -{ - return __futex_abstimed_wait_common64 (futex_word, expected, clockid, - abstime, private, true); -} -libpthread_hidden_def (__futex_abstimed_wait_cancelable64) -- cgit v1.2.3