ia64: Remove custom lowlevellock.h.
diff mbox

Message ID 1418856317.20194.11.camel@triegel.csb
State New
Headers show

Commit Message

Torvald Riegel Dec. 17, 2014, 10:45 p.m. UTC
ia64 seems to use the same implementation of low-level locks as the
generic Linux lowlevellock.h.  The futex syscalls are somewhat
different, but Roland thought it shouldn't matter.  Note that the futex
calls are on the slow path always (except for PI mutexes).

Removing the custom low-level lock implementation will make further
refactoring easier, for example adding proper error checking to futex
operations.

Not tested at all.  Mike, could you review and test, please?

Thanks!


2014-12-17  Torvald Riegel  <triegel@redhat.com>

	* sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Remove file.

Comments

Torvald Riegel Jan. 7, 2015, 3:45 p.m. UTC | #1
Ping.

On Wed, 2014-12-17 at 23:45 +0100, Torvald Riegel wrote:
> ia64 seems to use the same implementation of low-level locks as the
> generic Linux lowlevellock.h.  The futex syscalls are somewhat
> different, but Roland thought it shouldn't matter.  Note that the futex
> calls are on the slow path always (except for PI mutexes).
> 
> Removing the custom low-level lock implementation will make further
> refactoring easier, for example adding proper error checking to futex
> operations.
> 
> Not tested at all.  Mike, could you review and test, please?
> 
> Thanks!
> 
> 
> 2014-12-17  Torvald Riegel  <triegel@redhat.com>
> 
> 	* sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Remove file.
>
Mike Frysinger Feb. 17, 2015, 7:45 a.m. UTC | #2
On 17 Dec 2014 23:45, Torvald Riegel wrote:
> ia64 seems to use the same implementation of low-level locks as the
> generic Linux lowlevellock.h.  The futex syscalls are somewhat
> different, but Roland thought it shouldn't matter.  Note that the futex
> calls are on the slow path always (except for PI mutexes).
> 
> Removing the custom low-level lock implementation will make further
> refactoring easier, for example adding proper error checking to futex
> operations.
> 
> Not tested at all.  Mike, could you review and test, please?

builds fine & no test regressions -> pushed.  thanks for the cleanup !
-mike

Patch
diff mbox

commit ad38eb87733cd31be7ec456e480fbc8cc9edf590
Author: Torvald Riegel <triegel@redhat.com>
Date:   Wed Dec 17 23:08:25 2014 +0100

    ia64: Remove custom lowlevellock.h.

diff --git a/sysdeps/unix/sysv/linux/ia64/lowlevellock.h b/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
deleted file mode 100644
index b586731..0000000
--- a/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
+++ /dev/null
@@ -1,314 +0,0 @@ 
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Jakub Jelinek <jakub@redhat.com>, 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
-   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/>.  */
-
-#ifndef _LOWLEVELLOCK_H
-#define _LOWLEVELLOCK_H	1
-
-#include <time.h>
-#include <sys/param.h>
-#include <bits/pthreadtypes.h>
-#include <ia64intrin.h>
-#include <atomic.h>
-#include <kernel-features.h>
-
-#define __NR_futex		1230
-#define FUTEX_WAIT		0
-#define FUTEX_WAKE		1
-#define FUTEX_REQUEUE		3
-#define FUTEX_CMP_REQUEUE	4
-#define FUTEX_WAKE_OP		5
-#define FUTEX_OP_CLEAR_WAKE_IF_GT_ONE	((4 << 24) | 1)
-#define FUTEX_LOCK_PI		6
-#define FUTEX_UNLOCK_PI		7
-#define FUTEX_TRYLOCK_PI	8
-#define FUTEX_WAIT_BITSET	9
-#define FUTEX_WAKE_BITSET	10
-#define FUTEX_WAIT_REQUEUE_PI	11
-#define FUTEX_CMP_REQUEUE_PI	12
-#define FUTEX_PRIVATE_FLAG	128
-#define FUTEX_CLOCK_REALTIME	256
-
-#define FUTEX_BITSET_MATCH_ANY	0xffffffff
-
-/* Values for 'private' parameter of locking macros.  Yes, the
-   definition seems to be backwards.  But it is not.  The bit will be
-   reversed before passing to the system call.  */
-#define LLL_PRIVATE	0
-#define LLL_SHARED	FUTEX_PRIVATE_FLAG
-
-
-#if IS_IN (libc) || IS_IN (rtld)
-/* In libc.so or ld.so all futexes are private.  */
-# ifdef __ASSUME_PRIVATE_FUTEX
-#  define __lll_private_flag(fl, private) \
-  ((fl) | FUTEX_PRIVATE_FLAG)
-# else
-#  define __lll_private_flag(fl, private) \
-  ((fl) | THREAD_GETMEM (THREAD_SELF, header.private_futex))
-# endif
-#else
-# ifdef __ASSUME_PRIVATE_FUTEX
-#  define __lll_private_flag(fl, private) \
-  (((fl) | FUTEX_PRIVATE_FLAG) ^ (private))
-# else
-#  define __lll_private_flag(fl, private) \
-  (__builtin_constant_p (private)					      \
-   ? ((private) == 0							      \
-      ? ((fl) | THREAD_GETMEM (THREAD_SELF, header.private_futex))	      \
-      : (fl))								      \
-   : ((fl) | (((private) ^ FUTEX_PRIVATE_FLAG)				      \
-	      & THREAD_GETMEM (THREAD_SELF, header.private_futex))))
-# endif
-#endif
-
-
-/* Delay in spinlock loop.  */
-#define BUSY_WAIT_NOP          asm ("hint @pause")
-
-#define lll_futex_wait(futex, val, private) \
-  lll_futex_timed_wait (futex, val, NULL, private)
-
-#define lll_futex_timed_wait(ftx, val, timespec, private)		\
-({									\
-   DO_INLINE_SYSCALL(futex, 4, (long) (ftx),				\
-		     __lll_private_flag (FUTEX_WAIT, private),		\
-		     (int) (val), (long) (timespec));			\
-   _r10 == -1 ? -_retval : _retval;					\
-})
-
-#define lll_futex_timed_wait_bitset(ftx, val, timespec, clockbit, private) \
-({									   \
-   int __op = FUTEX_WAIT_BITSET | (clockbit);				   \
-									   \
-   DO_INLINE_SYSCALL(futex, 6, (long) (ftx),				   \
-		     __lll_private_flag (__op, private),		   \
-		     (int) (val), (long) (timespec), NULL /* Unused.  */,  \
-		     FUTEX_BITSET_MATCH_ANY);				   \
-   _r10 == -1 ? -_retval : _retval;					   \
-})
-
-#define lll_futex_wake(ftx, nr, private)				\
-({									\
-   DO_INLINE_SYSCALL(futex, 3, (long) (ftx),				\
-		     __lll_private_flag (FUTEX_WAKE, private),		\
-		     (int) (nr));					\
-   _r10 == -1 ? -_retval : _retval;					\
-})
-
-/* Returns non-zero if error happened, zero if success.  */
-#define lll_futex_requeue(ftx, nr_wake, nr_move, mutex, val, private)	     \
-({									     \
-   DO_INLINE_SYSCALL(futex, 6, (long) (ftx),				     \
-		     __lll_private_flag (FUTEX_CMP_REQUEUE, private),	     \
-		     (int) (nr_wake), (int) (nr_move), (long) (mutex),	     \
-		     (int) val);					     \
-   _r10 == -1;								     \
-})
-
-/* Returns non-zero if error happened, zero if success.  */
-#define lll_futex_wake_unlock(ftx, nr_wake, nr_wake2, ftx2, private)	     \
-({									     \
-   DO_INLINE_SYSCALL(futex, 6, (long) (ftx),				     \
-		     __lll_private_flag (FUTEX_WAKE_OP, private),	     \
-		     (int) (nr_wake), (int) (nr_wake2), (long) (ftx2),	     \
-		     FUTEX_OP_CLEAR_WAKE_IF_GT_ONE);			     \
-   _r10 == -1;								     \
-})
-
-/* Priority Inheritance support.  */
-#define lll_futex_wait_requeue_pi(futexp, val, mutex, private) \
-  lll_futex_timed_wait_requeue_pi (futexp, val, NULL, 0, mutex, private)
-
-#define lll_futex_timed_wait_requeue_pi(futexp, val, timespec, clockbit,      \
-					mutex, private)			      \
-({									      \
-   int __op = FUTEX_WAIT_REQUEUE_PI | (clockbit);			      \
-									      \
-   DO_INLINE_SYSCALL(futex, 5, (long) (futexp),				      \
-		     __lll_private_flag (__op, private),		      \
-		     (val), (timespec), mutex); 			      \
-   _r10 == -1;								      \
-})
-
-#define lll_futex_cmp_requeue_pi(futexp, nr_wake, nr_move, mutex, val, priv)  \
-({									      \
-   DO_INLINE_SYSCALL(futex, 6, (long) (futexp),				      \
-		     __lll_private_flag (FUTEX_CMP_REQUEUE_PI, priv),	      \
-		    (nr_wake), (nr_move), (mutex), (val));		      \
-   _r10 == -1 ? -_retval : _retval;					      \
-})
-
-
-#define __lll_trylock(futex) \
-  (atomic_compare_and_exchange_val_acq (futex, 1, 0) != 0)
-#define lll_trylock(futex) __lll_trylock (&(futex))
-
-
-#define __lll_cond_trylock(futex) \
-  (atomic_compare_and_exchange_val_acq (futex, 2, 0) != 0)
-#define lll_cond_trylock(futex) __lll_cond_trylock (&(futex))
-
-
-extern void __lll_lock_wait_private (int *futex) attribute_hidden;
-extern void __lll_lock_wait (int *futex, int private) attribute_hidden;
-extern int __lll_robust_lock_wait (int *futex, int private) attribute_hidden;
-
-
-#define __lll_lock(futex, private)					      \
-  ((void) ({								      \
-    int *__futex = (futex);						      \
-    if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex,      \
-								1, 0), 0))    \
-      {									      \
-	if (__builtin_constant_p (private) && (private) == LLL_PRIVATE)	      \
-	  __lll_lock_wait_private (__futex);				      \
-	else								      \
-	  __lll_lock_wait (__futex, private);				      \
-      }									      \
-  }))
-#define lll_lock(futex, private) __lll_lock (&(futex), private)
-
-
-#define __lll_robust_lock(futex, id, private)				      \
-  ({									      \
-    int *__futex = (futex);						      \
-    int __val = 0;							      \
-									      \
-    if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, id,  \
-								0), 0))	      \
-      __val = __lll_robust_lock_wait (__futex, private);		      \
-    __val;								      \
-  })
-#define lll_robust_lock(futex, id, private) \
-  __lll_robust_lock (&(futex), id, private)
-
-
-#define __lll_cond_lock(futex, private)					      \
-  ((void) ({								      \
-    int *__futex = (futex);						      \
-    if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, 2,   \
-								0), 0))	      \
-      __lll_lock_wait (__futex, private);				      \
-  }))
-#define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private)
-
-
-#define __lll_robust_cond_lock(futex, id, private)			      \
-  ({									      \
-    int *__futex = (futex);						      \
-    int __val = 0;							      \
-    int __id = (id) | FUTEX_WAITERS;					      \
-									      \
-    if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex,      \
-								__id, 0), 0)) \
-      __val = __lll_robust_lock_wait (__futex, private);		      \
-    __val;								      \
-  })
-#define lll_robust_cond_lock(futex, id, private) \
-  __lll_robust_cond_lock (&(futex), id, private)
-
-
-extern int __lll_timedlock_wait (int *futex, const struct timespec *,
-				 int private) attribute_hidden;
-extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *,
-					int private) attribute_hidden;
-
-
-#define __lll_timedlock(futex, abstime, private)			      \
-  ({									      \
-     int *__futex = (futex);						      \
-     int __val = 0;							      \
-									      \
-     if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, 1,  \
-								 0), 0))      \
-       __val = __lll_timedlock_wait (__futex, abstime, private);	      \
-     __val;								      \
-  })
-#define lll_timedlock(futex, abstime, private) \
-  __lll_timedlock (&(futex), abstime, private)
-
-
-#define __lll_robust_timedlock(futex, abstime, id, private)		      \
-  ({									      \
-    int *__futex = (futex);						      \
-    int __val = 0;							      \
-									      \
-    if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, id,  \
-								0), 0))	      \
-      __val = __lll_robust_timedlock_wait (__futex, abstime, private);	      \
-    __val;								      \
-  })
-#define lll_robust_timedlock(futex, abstime, id, private) \
-  __lll_robust_timedlock (&(futex), abstime, id, private)
-
-
-#define __lll_unlock(futex, private)					      \
-  ((void) ({								      \
-    int *__futex = (futex);						      \
-    int __val = atomic_exchange_rel (__futex, 0);			      \
-									      \
-    if (__builtin_expect (__val > 1, 0))				      \
-      lll_futex_wake (__futex, 1, private);				      \
-  }))
-#define lll_unlock(futex, private) __lll_unlock(&(futex), private)
-
-
-#define __lll_robust_unlock(futex, private)				      \
-  ((void) ({								      \
-    int *__futex = (futex);						      \
-    int __val = atomic_exchange_rel (__futex, 0);			      \
-									      \
-    if (__builtin_expect (__val & FUTEX_WAITERS, 0))			      \
-      lll_futex_wake (__futex, 1, private);				      \
-  }))
-#define lll_robust_unlock(futex, private) \
-  __lll_robust_unlock(&(futex), private)
-
-
-#define lll_islocked(futex) \
-  (futex != 0)
-
-/* Initializers for lock.  */
-#define LLL_LOCK_INITIALIZER		(0)
-#define LLL_LOCK_INITIALIZER_LOCKED	(1)
-
-/* The kernel notifies a process which uses CLONE_CHILD_CLEARTID via futex
-   wakeup when the clone terminates.  The memory location contains the
-   thread ID while the clone is running and is reset to zero
-   afterwards.	*/
-#define lll_wait_tid(tid) \
-  do							\
-    {							\
-      __typeof (tid) __tid;				\
-      while ((__tid = (tid)) != 0)			\
-	lll_futex_wait (&(tid), __tid, LLL_SHARED);	\
-    }							\
-  while (0)
-
-extern int __lll_timedwait_tid (int *, const struct timespec *)
-     attribute_hidden;
-
-#define lll_timedwait_tid(tid, abstime) \
-  ({							\
-    int __res = 0;					\
-    if ((tid) != 0)					\
-      __res = __lll_timedwait_tid (&(tid), (abstime));	\
-    __res;						\
-  })
-
-#endif	/* lowlevellock.h */