]> git.ipfire.org Git - thirdparty/glibc.git/blobdiff - nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
Replace FSF snail mail address with URLs.
[thirdparty/glibc.git] / nptl / sysdeps / unix / sysv / linux / x86_64 / lowlevellock.h
index 4030bb7fb875858430b3e21add2643d4abaa6f77..ab7ca6ae9e1ca0feb2e507968872dafdf2cae9f8 100644 (file)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2004, 2006-2008, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
    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, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   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>
-
-#ifndef LOCK_INSTR
-# ifdef UP
-#  define LOCK_INSTR   /* nothing */
-# else
-#  define LOCK_INSTR "lock;"
+#ifndef __ASSEMBLER__
+# include <time.h>
+# include <sys/param.h>
+# include <bits/pthreadtypes.h>
+# include <kernel-features.h>
+# include <tcb-offsets.h>
+
+# ifndef LOCK_INSTR
+#  ifdef UP
+#   define LOCK_INSTR  /* nothing */
+#  else
+#   define LOCK_INSTR "lock;"
+#  endif
+# endif
+#else
+# ifndef LOCK
+#  ifdef UP
+#   define LOCK
+#  else
+#   define LOCK lock
+#  endif
 # endif
 #endif
 
 #define FUTEX_WAIT             0
 #define FUTEX_WAKE             1
 #define FUTEX_CMP_REQUEUE      4
+#define FUTEX_WAKE_OP          5
 #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
+
+#define FUTEX_OP_CLEAR_WAKE_IF_GT_ONE  ((4 << 24) | 1)
+
+/* 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
+
+#ifndef __ASSEMBLER__
+
+#if !defined NOT_IN_libc || defined 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))                                                                \
+   : ({ unsigned int __fl = ((private) ^ FUTEX_PRIVATE_FLAG);                \
+       asm ("andl %%fs:%P1, %0" : "+r" (__fl)                                \
+            : "i" (offsetof (struct pthread, header.private_futex)));        \
+       __fl | (fl); }))
+# endif
+#endif
 
-
-/* Initializer for compatibility lock.  */
-#define LLL_MUTEX_LOCK_INITIALIZER             (0)
-#define LLL_MUTEX_LOCK_INITIALIZER_LOCKED      (1)
-#define LLL_MUTEX_LOCK_INITIALIZER_WAITERS     (2)
+/* Initializer for lock.  */
+#define LLL_LOCK_INITIALIZER           (0)
+#define LLL_LOCK_INITIALIZER_LOCKED    (1)
+#define LLL_LOCK_INITIALIZER_WAITERS   (2)
 
 /* Delay in spinlock loop.  */
-#define BUSY_WAIT_NOP          asm ("rep; nop")
+#define BUSY_WAIT_NOP    asm ("rep; nop")
 
 
 #define LLL_STUB_UNWIND_INFO_START \
@@ -148,284 +203,343 @@ LLL_STUB_UNWIND_INFO_START                                      \
 LLL_STUB_UNWIND_INFO_END
 
 
-#define lll_futex_wait(futex, val) \
-  ({                                                                         \
-    int __status;                                                            \
-    register __typeof (val) _val __asm ("edx") = (val);                              \
-    __asm __volatile ("xorq %%r10, %%r10\n\t"                                \
-                     "syscall"                                               \
-                     : "=a" (__status)                                       \
-                     : "0" (SYS_futex), "D" (futex), "S" (FUTEX_WAIT),       \
-                       "d" (_val)                                            \
-                     : "memory", "cc", "r10", "r11", "cx");                  \
-    __status;                                                                \
-  })
+#define lll_futex_wait(futex, val, private) \
+  lll_futex_timed_wait(futex, val, NULL, private)
 
 
-#define lll_futex_timed_wait(futex, val, timeout)                            \
+#define lll_futex_timed_wait(futex, val, timeout, private) \
   ({                                                                         \
     register const struct timespec *__to __asm ("r10") = timeout;            \
     int __status;                                                            \
     register __typeof (val) _val __asm ("edx") = (val);                              \
     __asm __volatile ("syscall"                                                      \
                      : "=a" (__status)                                       \
-                     : "0" (SYS_futex), "D" (futex), "S" (FUTEX_WAIT),       \
-                       "d" (_val), "r" (__to)                                \
+                     : "0" (SYS_futex), "D" (futex),                         \
+                       "S" (__lll_private_flag (FUTEX_WAIT, private)),       \
+                       "d" (_val), "r" (__to)                                \
                      : "memory", "cc", "r11", "cx");                         \
-    -__status;                                                               \
+    __status;                                                                \
   })
 
 
-#define lll_futex_wake(futex, nr) \
+#define lll_futex_wake(futex, nr, private) \
   do {                                                                       \
     int __ignore;                                                            \
     register __typeof (nr) _nr __asm ("edx") = (nr);                         \
     __asm __volatile ("syscall"                                                      \
                      : "=a" (__ignore)                                       \
-                     : "0" (SYS_futex), "D" (futex), "S" (FUTEX_WAKE),       \
+                     : "0" (SYS_futex), "D" (futex),                         \
+                       "S" (__lll_private_flag (FUTEX_WAKE, private)),       \
                        "d" (_nr)                                             \
                      : "memory", "cc", "r10", "r11", "cx");                  \
   } while (0)
 
 
-/* Does not preserve %eax and %ecx.  */
-extern int __lll_mutex_lock_wait (int *__futex, int __val) attribute_hidden;
-/* Does not preserver %eax, %ecx, and %edx.  */
-extern int __lll_mutex_timedlock_wait (int *__futex, int __val,
-                                      const struct timespec *__abstime)
-     attribute_hidden;
-/* Preserves all registers but %eax.  */
-extern int __lll_mutex_unlock_wait (int *__futex) attribute_hidden;
-
-
-/* NB: in the lll_mutex_trylock macro we simply return the value in %eax
+/* NB: in the lll_trylock macro we simply return the value in %eax
    after the cmpxchg instruction.  In case the operation succeded this
    value is zero.  In case the operation failed, the cmpxchg instruction
    has loaded the current value of the memory work which is guaranteed
    to be nonzero.  */
-#define lll_mutex_trylock(futex) \
+#if defined NOT_IN_libc || defined UP
+# define __lll_trylock_asm LOCK_INSTR "cmpxchgl %2, %1"
+#else
+# define __lll_trylock_asm "cmpl $0, __libc_multiple_threads(%%rip)\n\t"      \
+                          "je 0f\n\t"                                        \
+                          "lock; cmpxchgl %2, %1\n\t"                        \
+                          "jmp 1f\n\t"                                       \
+                          "0:\tcmpxchgl %2, %1\n\t"                          \
+                          "1:"
+#endif
+
+#define lll_trylock(futex) \
   ({ int ret;                                                                \
-     __asm __volatile (LOCK_INSTR "cmpxchgl %2, %1"                          \
+     __asm __volatile (__lll_trylock_asm                                     \
                       : "=a" (ret), "=m" (futex)                             \
-                      : "r" (LLL_MUTEX_LOCK_INITIALIZER_LOCKED), "m" (futex),\
-                        "0" (LLL_MUTEX_LOCK_INITIALIZER)                     \
+                      : "r" (LLL_LOCK_INITIALIZER_LOCKED), "m" (futex),      \
+                        "0" (LLL_LOCK_INITIALIZER)                           \
                       : "memory");                                           \
      ret; })
 
-
-#define lll_robust_mutex_trylock(futex, id)                                  \
+#define lll_robust_trylock(futex, id) \
   ({ int ret;                                                                \
      __asm __volatile (LOCK_INSTR "cmpxchgl %2, %1"                          \
                       : "=a" (ret), "=m" (futex)                             \
-                      : "r" (id), "m" (futex),                               \
-                        "0" (LLL_MUTEX_LOCK_INITIALIZER)                     \
+                      : "r" (id), "m" (futex), "0" (LLL_LOCK_INITIALIZER)    \
                       : "memory");                                           \
      ret; })
 
-
-#define lll_mutex_cond_trylock(futex) \
+#define lll_cond_trylock(futex) \
   ({ int ret;                                                                \
      __asm __volatile (LOCK_INSTR "cmpxchgl %2, %1"                          \
                       : "=a" (ret), "=m" (futex)                             \
-                      : "r" (LLL_MUTEX_LOCK_INITIALIZER_WAITERS),            \
-                        "m" (futex), "0" (LLL_MUTEX_LOCK_INITIALIZER)        \
+                      : "r" (LLL_LOCK_INITIALIZER_WAITERS),                  \
+                        "m" (futex), "0" (LLL_LOCK_INITIALIZER)              \
                       : "memory");                                           \
      ret; })
 
-
-#define lll_mutex_lock(futex) \
-  (void) ({ int ignore1, ignore2, ignore3;                                   \
-           __asm __volatile (LOCK_INSTR "cmpxchgl %0, %2\n\t"                \
+#if defined NOT_IN_libc || defined UP
+# define __lll_lock_asm_start LOCK_INSTR "cmpxchgl %4, %2\n\t"               \
+                             "jnz 1f\n\t"
+#else
+# define __lll_lock_asm_start "cmpl $0, __libc_multiple_threads(%%rip)\n\t"   \
+                             "je 0f\n\t"                                     \
+                             "lock; cmpxchgl %4, %2\n\t"                     \
                              "jnz 1f\n\t"                                    \
-                             ".subsection 1\n\t"                             \
-                             ".type  _L_mutex_lock_%=, @function\n"          \
-                             "_L_mutex_lock_%=:\n"                           \
-                             "1:\tleaq %2, %%rdi\n"                          \
-                             "2:\tsubq $128, %%rsp\n"                        \
-                             "3:\tcallq __lll_mutex_lock_wait\n"             \
-                             "4:\taddq $128, %%rsp\n"                        \
-                             "5:\tjmp 24f\n"                                 \
-                             "6:\t.size _L_mutex_lock_%=, 6b-1b\n\t"         \
-                             ".previous\n"                                   \
-                             LLL_STUB_UNWIND_INFO_5                          \
-                             "24:"                                           \
-                             : "=S" (ignore1), "=&D" (ignore2), "=m" (futex),\
-                               "=a" (ignore3)                                \
-                             : "0" (1), "m" (futex), "3" (0)                 \
-                             : "cx", "r11", "cc", "memory"); })
-
-
-#define lll_robust_mutex_lock(futex, id) \
+                             "jmp 24f\n"                                     \
+                             "0:\tcmpxchgl %4, %2\n\t"                       \
+                             "jnz 1f\n\t"
+#endif
+
+#define lll_lock(futex, private) \
+  (void)                                                                     \
+    ({ int ignore1, ignore2, ignore3;                                        \
+       if (__builtin_constant_p (private) && (private) == LLL_PRIVATE)       \
+        __asm __volatile (__lll_lock_asm_start                               \
+                          ".subsection 1\n\t"                                \
+                          ".type _L_lock_%=, @function\n"                    \
+                          "_L_lock_%=:\n"                                    \
+                          "1:\tleaq %2, %%rdi\n"                             \
+                          "2:\tsubq $128, %%rsp\n"                           \
+                          "3:\tcallq __lll_lock_wait_private\n"              \
+                          "4:\taddq $128, %%rsp\n"                           \
+                          "5:\tjmp 24f\n"                                    \
+                          "6:\t.size _L_lock_%=, 6b-1b\n\t"                  \
+                          ".previous\n"                                      \
+                          LLL_STUB_UNWIND_INFO_5                             \
+                          "24:"                                              \
+                          : "=S" (ignore1), "=&D" (ignore2), "=m" (futex),   \
+                            "=a" (ignore3)                                   \
+                          : "0" (1), "m" (futex), "3" (0)                    \
+                          : "cx", "r11", "cc", "memory");                    \
+       else                                                                  \
+        __asm __volatile (__lll_lock_asm_start                               \
+                          ".subsection 1\n\t"                                \
+                          ".type _L_lock_%=, @function\n"                    \
+                          "_L_lock_%=:\n"                                    \
+                          "1:\tleaq %2, %%rdi\n"                             \
+                          "2:\tsubq $128, %%rsp\n"                           \
+                          "3:\tcallq __lll_lock_wait\n"                      \
+                          "4:\taddq $128, %%rsp\n"                           \
+                          "5:\tjmp 24f\n"                                    \
+                          "6:\t.size _L_lock_%=, 6b-1b\n\t"                  \
+                          ".previous\n"                                      \
+                          LLL_STUB_UNWIND_INFO_5                             \
+                          "24:"                                              \
+                          : "=S" (ignore1), "=D" (ignore2), "=m" (futex),    \
+                            "=a" (ignore3)                                   \
+                          : "1" (1), "m" (futex), "3" (0), "0" (private)     \
+                          : "cx", "r11", "cc", "memory");                    \
+    })                                                                       \
+
+#define lll_robust_lock(futex, id, private) \
   ({ int result, ignore1, ignore2;                                           \
-    __asm __volatile (LOCK_INSTR "cmpxchgl %0, %2\n\t"                       \
+    __asm __volatile (LOCK_INSTR "cmpxchgl %4, %2\n\t"                       \
                      "jnz 1f\n\t"                                            \
                      ".subsection 1\n\t"                                     \
-                     ".type  _L_robust_mutex_lock_%=, @function\n"           \
-                     "_L_robust_mutex_lock_%=:\n"                            \
+                     ".type _L_robust_lock_%=, @function\n"                  \
+                     "_L_robust_lock_%=:\n"                                  \
                      "1:\tleaq %2, %%rdi\n"                                  \
                      "2:\tsubq $128, %%rsp\n"                                \
-                     "3:\tcallq __lll_robust_mutex_lock_wait\n"              \
+                     "3:\tcallq __lll_robust_lock_wait\n"                    \
                      "4:\taddq $128, %%rsp\n"                                \
                      "5:\tjmp 24f\n"                                         \
-                     "6:\t.size _L_robust_mutex_lock_%=, 6b-1b\n\t"          \
+                     "6:\t.size _L_robust_lock_%=, 6b-1b\n\t"                \
                      ".previous\n"                                           \
                      LLL_STUB_UNWIND_INFO_5                                  \
                      "24:"                                                   \
-                     : "=S" (ignore1), "=&D" (ignore2), "=m" (futex),        \
+                     : "=S" (ignore1), "=D" (ignore2), "=m" (futex),         \
                        "=a" (result)                                         \
-                     : "0" (id), "m" (futex), "3" (0)                        \
+                     : "1" (id), "m" (futex), "3" (0), "0" (private)         \
                      : "cx", "r11", "cc", "memory");                         \
     result; })
 
-
-#define lll_mutex_cond_lock(futex) \
-  (void) ({ int ignore1, ignore2, ignore3;                                   \
-           __asm __volatile (LOCK_INSTR "cmpxchgl %0, %2\n\t"                \
-                             "jnz 1f\n\t"                                    \
-                             ".subsection 1\n\t"                             \
-                             ".type  _L_mutex_cond_lock_%=, @function\n"     \
-                             "_L_mutex_cond_lock_%=:\n"                      \
-                             "1:\tleaq %2, %%rdi\n"                          \
-                             "2:\tsubq $128, %%rsp\n"                        \
-                             "3:\tcallq __lll_mutex_lock_wait\n"             \
-                             "4:\taddq $128, %%rsp\n"                        \
-                             "5:\tjmp 24f\n"                                 \
-                             "6:\t.size _L_mutex_cond_lock_%=, 6b-1b\n\t"    \
-                             ".previous\n"                                   \
-                             LLL_STUB_UNWIND_INFO_5                          \
-                             "24:"                                           \
-                             : "=S" (ignore1), "=&D" (ignore2), "=m" (futex),\
-                               "=a" (ignore3)                                \
-                             : "0" (2), "m" (futex), "3" (0)                 \
-                             : "cx", "r11", "cc", "memory"); })
-
-
-#define lll_robust_mutex_cond_lock(futex, id) \
+#define lll_cond_lock(futex, private) \
+  (void)                                                                     \
+    ({ int ignore1, ignore2, ignore3;                                        \
+       __asm __volatile (LOCK_INSTR "cmpxchgl %4, %2\n\t"                    \
+                        "jnz 1f\n\t"                                         \
+                        ".subsection 1\n\t"                                  \
+                        ".type _L_cond_lock_%=, @function\n"                 \
+                        "_L_cond_lock_%=:\n"                                 \
+                        "1:\tleaq %2, %%rdi\n"                               \
+                        "2:\tsubq $128, %%rsp\n"                             \
+                        "3:\tcallq __lll_lock_wait\n"                        \
+                        "4:\taddq $128, %%rsp\n"                             \
+                        "5:\tjmp 24f\n"                                      \
+                        "6:\t.size _L_cond_lock_%=, 6b-1b\n\t"               \
+                        ".previous\n"                                        \
+                        LLL_STUB_UNWIND_INFO_5                               \
+                        "24:"                                                \
+                        : "=S" (ignore1), "=D" (ignore2), "=m" (futex),      \
+                          "=a" (ignore3)                                     \
+                        : "1" (2), "m" (futex), "3" (0), "0" (private)       \
+                        : "cx", "r11", "cc", "memory");                      \
+    })
+
+#define lll_robust_cond_lock(futex, id, private) \
   ({ int result, ignore1, ignore2;                                           \
-    __asm __volatile (LOCK_INSTR "cmpxchgl %0, %2\n\t"                       \
+    __asm __volatile (LOCK_INSTR "cmpxchgl %4, %2\n\t"                       \
                      "jnz 1f\n\t"                                            \
                      ".subsection 1\n\t"                                     \
-                     ".type  _L_robust_mutex_cond_lock_%=, @function\n"      \
-                     "_L_robust_mutex_cond_lock_%=:\n"                       \
+                     ".type _L_robust_cond_lock_%=, @function\n"             \
+                     "_L_robust_cond_lock_%=:\n"                             \
                      "1:\tleaq %2, %%rdi\n"                                  \
                      "2:\tsubq $128, %%rsp\n"                                \
-                     "3:\tcallq __lll_robust_mutex_lock_wait\n"              \
+                     "3:\tcallq __lll_robust_lock_wait\n"                    \
                      "4:\taddq $128, %%rsp\n"                                \
                      "5:\tjmp 24f\n"                                         \
-                     "6:\t.size _L_robust_mutex_cond_lock_%=, 6b-1b\n\t"     \
+                     "6:\t.size _L_robust_cond_lock_%=, 6b-1b\n\t"           \
                      ".previous\n"                                           \
                      LLL_STUB_UNWIND_INFO_5                                  \
                      "24:"                                                   \
-                     : "=S" (ignore1), "=&D" (ignore2), "=m" (futex),        \
+                     : "=S" (ignore1), "=D" (ignore2), "=m" (futex),         \
                        "=a" (result)                                         \
-                     : "0" (id | FUTEX_WAITERS), "m" (futex), "3" (0)        \
+                     : "1" (id | FUTEX_WAITERS), "m" (futex), "3" (0),       \
+                       "0" (private)                                         \
                      : "cx", "r11", "cc", "memory");                         \
     result; })
 
-
-#define lll_mutex_timedlock(futex, timeout) \
+#define lll_timedlock(futex, timeout, private) \
   ({ int result, ignore1, ignore2, ignore3;                                  \
-     __asm __volatile (LOCK_INSTR "cmpxchgl %2, %4\n\t"                              \
+     __asm __volatile (LOCK_INSTR "cmpxchgl %1, %4\n\t"                              \
                       "jnz 1f\n\t"                                           \
                       ".subsection 1\n\t"                                    \
-                      ".type  _L_mutex_timedlock_%=, @function\n"            \
-                      "_L_mutex_timedlock_%=:\n"                             \
+                      ".type _L_timedlock_%=, @function\n"                   \
+                      "_L_timedlock_%=:\n"                                   \
                       "1:\tleaq %4, %%rdi\n"                                 \
                       "0:\tmovq %8, %%rdx\n"                                 \
                       "2:\tsubq $128, %%rsp\n"                               \
-                      "3:\tcallq __lll_mutex_timedlock_wait\n"               \
+                      "3:\tcallq __lll_timedlock_wait\n"                     \
                       "4:\taddq $128, %%rsp\n"                               \
                       "5:\tjmp 24f\n"                                        \
-                      "6:\t.size _L_mutex_timedlock_%=, 6b-1b\n\t"           \
+                      "6:\t.size _L_timedlock_%=, 6b-1b\n\t"                 \
                       ".previous\n"                                          \
                       LLL_STUB_UNWIND_INFO_6                                 \
                       "24:"                                                  \
-                      : "=a" (result), "=&D" (ignore1), "=S" (ignore2),      \
+                      : "=a" (result), "=D" (ignore1), "=S" (ignore2),       \
                         "=&d" (ignore3), "=m" (futex)                        \
-                      : "0" (0), "2" (1), "m" (futex), "m" (timeout)         \
+                      : "0" (0), "1" (1), "m" (futex), "m" (timeout),        \
+                        "2" (private)                                        \
                       : "memory", "cx", "cc", "r10", "r11");                 \
      result; })
 
-
-#define lll_robust_mutex_timedlock(futex, timeout, id) \
+#define lll_robust_timedlock(futex, timeout, id, private) \
   ({ int result, ignore1, ignore2, ignore3;                                  \
-     __asm __volatile (LOCK_INSTR "cmpxchgl %2, %4\n\t"                              \
+     __asm __volatile (LOCK_INSTR "cmpxchgl %1, %4\n\t"                              \
                       "jnz 1f\n\t"                                           \
                       ".subsection 1\n\t"                                    \
-                      ".type  _L_robust_mutex_timedlock_%=, @function\n"     \
-                      "_L_robust_mutex_timedlock_%=:\n"                      \
+                      ".type _L_robust_timedlock_%=, @function\n"            \
+                      "_L_robust_timedlock_%=:\n"                            \
                       "1:\tleaq %4, %%rdi\n"                                 \
                       "0:\tmovq %8, %%rdx\n"                                 \
                       "2:\tsubq $128, %%rsp\n"                               \
-                      "3:\tcallq __lll_robust_mutex_timedlock_wait\n"        \
+                      "3:\tcallq __lll_robust_timedlock_wait\n"              \
                       "4:\taddq $128, %%rsp\n"                               \
                       "5:\tjmp 24f\n"                                        \
-                      "6:\t.size _L_robust_mutex_timedlock_%=, 6b-1b\n\t"    \
+                      "6:\t.size _L_robust_timedlock_%=, 6b-1b\n\t"          \
                       ".previous\n"                                          \
                       LLL_STUB_UNWIND_INFO_6                                 \
                       "24:"                                                  \
-                      : "=a" (result), "=&D" (ignore1), "=S" (ignore2),      \
+                      : "=a" (result), "=D" (ignore1), "=S" (ignore2),       \
                         "=&d" (ignore3), "=m" (futex)                        \
-                      : "0" (0), "2" (id), "m" (futex), "m" (timeout)        \
+                      : "0" (0), "1" (id), "m" (futex), "m" (timeout),       \
+                        "2" (private)                                        \
                       : "memory", "cx", "cc", "r10", "r11");                 \
      result; })
 
+#if defined NOT_IN_libc || defined UP
+# define __lll_unlock_asm_start LOCK_INSTR "decl %0\n\t"                     \
+                               "jne 1f\n\t"
+#else
+# define __lll_unlock_asm_start "cmpl $0, __libc_multiple_threads(%%rip)\n\t" \
+                               "je 0f\n\t"                                   \
+                               "lock; decl %0\n\t"                           \
+                               "jne 1f\n\t"                                  \
+                               "jmp 24f\n\t"                                 \
+                               "0:\tdecl %0\n\t"                             \
+                               "jne 1f\n\t"
+#endif
 
-#define lll_mutex_unlock(futex) \
-  (void) ({ int ignore;                                                              \
-            __asm __volatile (LOCK_INSTR "decl %0\n\t"                       \
-                             "jne 1f\n\t"                                    \
-                             ".subsection 1\n\t"                             \
-                             ".type  _L_mutex_unlock_%=, @function\n"        \
-                             "_L_mutex_unlock_%=:\n"                         \
-                             "1:\tleaq %0, %%rdi\n"                          \
-                             "2:\tsubq $128, %%rsp\n"                        \
-                             "3:\tcallq __lll_mutex_unlock_wake\n"           \
-                             "4:\taddq $128, %%rsp\n"                        \
-                             "5:\tjmp 24f\n"                                 \
-                             "6:\t.size _L_mutex_unlock_%=, 6b-1b\n\t"       \
-                             ".previous\n"                                   \
-                             LLL_STUB_UNWIND_INFO_5                          \
-                             "24:"                                           \
-                             : "=m" (futex), "=&D" (ignore)                  \
-                             : "m" (futex)                                   \
-                             : "ax", "cx", "r11", "cc", "memory"); })
-
-
-#define lll_robust_mutex_unlock(futex) \
-  (void) ({ int ignore;                                                              \
-           __asm __volatile (LOCK_INSTR "andl %2, %0\n\t"                    \
-                             "jne 1f\n\t"                                    \
-                             ".subsection 1\n\t"                             \
-                             ".type  _L_robust_mutex_unlock_%=, @function\n" \
-                             "_L_robust_mutex_unlock_%=:\n"                  \
-                             "1:\tleaq %0, %%rdi\n"                          \
-                             "2:\tsubq $128, %%rsp\n"                        \
-                             "3:\tcallq __lll_mutex_unlock_wake\n"           \
-                             "4:\taddq $128, %%rsp\n"                        \
-                             "5:\tjmp 24f\n"                                 \
-                             "6:\t.size _L_robust_mutex_unlock_%=, 6b-1b\n\t"\
-                             ".previous\n"                                   \
-                             LLL_STUB_UNWIND_INFO_5                          \
-                             "24:"                                           \
-                             : "=m" (futex), "=&D" (ignore)                  \
-                             : "i" (FUTEX_WAITERS), "m" (futex)              \
-                             : "ax", "cx", "r11", "cc", "memory"); })
-
-
-#define lll_robust_mutex_dead(futex) \
-  (void) ({ int ignore;                     \
-           __asm __volatile (LOCK_INSTR "orl %3, (%2)\n\t"                   \
-                             "syscall"                                       \
-                             : "=m" (futex), "=a" (ignore)                   \
-                             : "D" (&(futex)), "i" (FUTEX_OWNER_DIED),       \
-                               "S" (FUTEX_WAKE), "1" (__NR_futex),           \
-                               "d" (1)                                       \
-                             : "cx", "r11", "cc", "memory"); })
-
+#define lll_unlock(futex, private) \
+  (void)                                                                     \
+    ({ int ignore;                                                           \
+       if (__builtin_constant_p (private) && (private) == LLL_PRIVATE)       \
+        __asm __volatile (__lll_unlock_asm_start                             \
+                          ".subsection 1\n\t"                                \
+                          ".type _L_unlock_%=, @function\n"                  \
+                          "_L_unlock_%=:\n"                                  \
+                          "1:\tleaq %0, %%rdi\n"                             \
+                          "2:\tsubq $128, %%rsp\n"                           \
+                          "3:\tcallq __lll_unlock_wake_private\n"            \
+                          "4:\taddq $128, %%rsp\n"                           \
+                          "5:\tjmp 24f\n"                                    \
+                          "6:\t.size _L_unlock_%=, 6b-1b\n\t"                \
+                          ".previous\n"                                      \
+                          LLL_STUB_UNWIND_INFO_5                             \
+                          "24:"                                              \
+                          : "=m" (futex), "=&D" (ignore)                     \
+                          : "m" (futex)                                      \
+                          : "ax", "cx", "r11", "cc", "memory");              \
+       else                                                                  \
+        __asm __volatile (__lll_unlock_asm_start                             \
+                          ".subsection 1\n\t"                                \
+                          ".type _L_unlock_%=, @function\n"                  \
+                          "_L_unlock_%=:\n"                                  \
+                          "1:\tleaq %0, %%rdi\n"                             \
+                          "2:\tsubq $128, %%rsp\n"                           \
+                          "3:\tcallq __lll_unlock_wake\n"                    \
+                          "4:\taddq $128, %%rsp\n"                           \
+                          "5:\tjmp 24f\n"                                    \
+                          "6:\t.size _L_unlock_%=, 6b-1b\n\t"                \
+                          ".previous\n"                                      \
+                          LLL_STUB_UNWIND_INFO_5                             \
+                          "24:"                                              \
+                          : "=m" (futex), "=&D" (ignore)                     \
+                          : "m" (futex), "S" (private)                       \
+                          : "ax", "cx", "r11", "cc", "memory");              \
+    })
+
+#define lll_robust_unlock(futex, private) \
+  do                                                                         \
+    {                                                                        \
+      int ignore;                                                            \
+      __asm __volatile (LOCK_INSTR "andl %2, %0\n\t"                         \
+                       "jne 1f\n\t"                                          \
+                       ".subsection 1\n\t"                                   \
+                       ".type _L_robust_unlock_%=, @function\n"              \
+                       "_L_robust_unlock_%=:\n"                              \
+                       "1:\tleaq %0, %%rdi\n"                                \
+                       "2:\tsubq $128, %%rsp\n"                              \
+                       "3:\tcallq __lll_unlock_wake\n"                       \
+                       "4:\taddq $128, %%rsp\n"                              \
+                       "5:\tjmp 24f\n"                                       \
+                       "6:\t.size _L_robust_unlock_%=, 6b-1b\n\t"            \
+                       ".previous\n"                                         \
+                       LLL_STUB_UNWIND_INFO_5                                \
+                       "24:"                                                 \
+                       : "=m" (futex), "=&D" (ignore)                        \
+                       : "i" (FUTEX_WAITERS), "m" (futex),                   \
+                         "S" (private)                                       \
+                       : "ax", "cx", "r11", "cc", "memory");                 \
+    }                                                                        \
+  while (0)
+
+#define lll_robust_dead(futex, private) \
+  do                                                                         \
+    {                                                                        \
+      int ignore;                                                            \
+      __asm __volatile (LOCK_INSTR "orl %3, (%2)\n\t"                        \
+                       "syscall"                                             \
+                       : "=m" (futex), "=a" (ignore)                         \
+                       : "D" (&(futex)), "i" (FUTEX_OWNER_DIED),             \
+                         "S" (__lll_private_flag (FUTEX_WAKE, private)),     \
+                         "1" (__NR_futex), "d" (1)                           \
+                       : "cx", "r11", "cc", "memory");                       \
+    }                                                                        \
+  while (0)
 
 /* Returns non-zero if error happened, zero if success.  */
-#define lll_futex_requeue(ftx, nr_wake, nr_move, mutex, val) \
+#define lll_futex_requeue(ftx, nr_wake, nr_move, mutex, val, private) \
   ({ int __res;                                                                      \
      register int __nr_move __asm ("r10") = nr_move;                         \
      register void *__mutex __asm ("r8") = mutex;                            \
@@ -433,120 +547,14 @@ extern int __lll_mutex_unlock_wait (int *__futex) attribute_hidden;
      __asm __volatile ("syscall"                                             \
                       : "=a" (__res)                                         \
                       : "0" (__NR_futex), "D" ((void *) ftx),                \
-                        "S" (FUTEX_CMP_REQUEUE), "d" (nr_wake),              \
-                        "r" (__nr_move), "r" (__mutex), "r" (__val)          \
+                        "S" (__lll_private_flag (FUTEX_CMP_REQUEUE,          \
+                                                 private)), "d" (nr_wake),   \
+                        "r" (__nr_move), "r" (__mutex), "r" (__val)          \
                       : "cx", "r11", "cc", "memory");                        \
      __res < 0; })
 
-
-#define lll_mutex_islocked(futex) \
-  (futex != LLL_MUTEX_LOCK_INITIALIZER)
-
-
-/* We have a separate internal lock implementation which is not tied
-   to binary compatibility.  */
-
-/* Type for lock object.  */
-typedef int lll_lock_t;
-
-/* Initializers for lock.  */
-#define LLL_LOCK_INITIALIZER           (0)
-#define LLL_LOCK_INITIALIZER_LOCKED    (1)
-
-
-extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
-
-
-/* The states of a lock are:
-    0  -  untaken
-    1  -  taken by one user
-    2  -  taken by more users */
-
-
-#if defined NOT_IN_libc || defined UP
-# define lll_trylock(futex) lll_mutex_trylock (futex)
-# define lll_lock(futex) lll_mutex_lock (futex)
-# define lll_unlock(futex) lll_mutex_unlock (futex)
-#else
-/* Special versions of the macros for use in libc itself.  They avoid
-   the lock prefix when the thread library is not used.
-
-   The code sequence to avoid unnecessary lock prefixes is what the AMD
-   guys suggested.  If you do not like it, bring it up with AMD.
-
-   XXX In future we might even want to avoid it on UP machines.  */
-
-# define lll_trylock(futex) \
-  ({ unsigned char ret;                                                              \
-     __asm __volatile ("cmpl $0, __libc_multiple_threads(%%rip)\n\t"         \
-                      "je 0f\n\t"                                            \
-                      "lock; cmpxchgl %2, %1\n\t"                            \
-                      "jmp 1f\n"                                             \
-                      "0:\tcmpxchgl %2, %1\n\t"                              \
-                      "1:setne %0"                                           \
-                      : "=a" (ret), "=m" (futex)                             \
-                      : "r" (LLL_MUTEX_LOCK_INITIALIZER_LOCKED), "m" (futex),\
-                        "0" (LLL_MUTEX_LOCK_INITIALIZER)                     \
-                      : "memory");                                           \
-     ret; })
-
-
-# define lll_lock(futex) \
-  (void) ({ int ignore1, ignore2, ignore3;                                   \
-           __asm __volatile ("cmpl $0, __libc_multiple_threads(%%rip)\n\t"   \
-                             "je 0f\n\t"                                     \
-                             "lock; cmpxchgl %0, %2\n\t"                     \
-                             "jnz 1f\n\t"                                    \
-                             "jmp 24f\n"                                     \
-                             "0:\tcmpxchgl %0, %2\n\t"                       \
-                             "jnz 1f\n\t"                                    \
-                             ".subsection 1\n\t"                             \
-                             ".type  _L_lock_%=, @function\n"                \
-                             "_L_lock_%=:\n"                                 \
-                             "1:\tleaq %2, %%rdi\n"                          \
-                             "2:\tsubq $128, %%rsp\n"                        \
-                             "3:\tcallq __lll_mutex_lock_wait\n"             \
-                             "4:\taddq $128, %%rsp\n"                        \
-                             "5:\tjmp 24f\n"                                 \
-                             "6:\t.size _L_lock_%=, 6b-1b\n\t"               \
-                             ".previous\n"                                   \
-                             LLL_STUB_UNWIND_INFO_5                          \
-                             "24:"                                           \
-                             : "=S" (ignore1), "=&D" (ignore2), "=m" (futex),\
-                               "=a" (ignore3)                                \
-                             : "0" (1), "m" (futex), "3" (0)                 \
-                             : "cx", "r11", "cc", "memory"); })
-
-
-# define lll_unlock(futex) \
-  (void) ({ int ignore;                                                              \
-            __asm __volatile ("cmpl $0, __libc_multiple_threads(%%rip)\n\t"   \
-                             "je 0f\n\t"                                     \
-                             "lock; decl %0\n\t"                             \
-                             "jne 1f\n\t"                                    \
-                             "jmp 24f\n"                                     \
-                             "0:\tdecl %0\n\t"                               \
-                             "jne 1f\n\t"                                    \
-                             ".subsection 1\n\t"                             \
-                             ".type  _L_unlock_%=, @function\n"              \
-                             "_L_unlock_%=:\n"                               \
-                             "1:\tleaq %0, %%rdi\n"                          \
-                             "2:\tsubq $128, %%rsp\n"                        \
-                             "3:\tcallq __lll_mutex_unlock_wake\n"           \
-                             "4:\taddq $128, %%rsp\n"                        \
-                             "5:\tjmp 24f\n"                                 \
-                             "6:\t.size _L_unlock_%=, 6b-1b\n\t"             \
-                             ".previous\n"                                   \
-                             LLL_STUB_UNWIND_INFO_5                          \
-                             "24:"                                           \
-                             : "=m" (futex), "=&D" (ignore)                  \
-                             : "m" (futex)                                   \
-                             : "ax", "cx", "r11", "cc", "memory"); })
-#endif
-
-
 #define lll_islocked(futex) \
-  (futex != LLL_MUTEX_LOCK_INITIALIZER)
+  (futex != LLL_LOCK_INITIALIZER)
 
 
 /* The kernel notifies a process with uses CLONE_CLEARTID via futex
@@ -585,25 +593,6 @@ extern int __lll_timedwait_tid (int *tid, const struct timespec *abstime)
       }                                                                              \
     __result; })
 
-
-/* Conditional variable handling.  */
-
-extern void __lll_cond_wait (pthread_cond_t *cond) attribute_hidden;
-extern int __lll_cond_timedwait (pthread_cond_t *cond,
-                                const struct timespec *abstime)
-     attribute_hidden;
-extern void __lll_cond_wake (pthread_cond_t *cond) attribute_hidden;
-extern void __lll_cond_broadcast (pthread_cond_t *cond) attribute_hidden;
-
-
-#define lll_cond_wait(cond) \
-  __lll_cond_wait (cond)
-#define lll_cond_timedwait(cond, abstime) \
-  __lll_cond_timedwait (cond, abstime)
-#define lll_cond_wake(cond) \
-  __lll_cond_wake (cond)
-#define lll_cond_broadcast(cond) \
-  __lll_cond_broadcast (cond)
-
+#endif  /* !__ASSEMBLER__ */
 
 #endif /* lowlevellock.h */