Replace lll_private_futex_* (*) with lll_futex_* (*, LLL_PRIVATE).
authordrepper <drepper>
Sat, 28 Jul 2007 19:30:20 +0000 (19:30 +0000)
committerdrepper <drepper>
Sat, 28 Jul 2007 19:30:20 +0000 (19:30 +0000)
16 files changed:
nptl/allocatestack.c
nptl/init.c
nptl/pthread_create.c
nptl/sysdeps/alpha/tls.h
nptl/sysdeps/i386/tls.h
nptl/sysdeps/ia64/tls.h
nptl/sysdeps/powerpc/tls.h
nptl/sysdeps/pthread/aio_misc.h
nptl/sysdeps/pthread/gai_misc.h
nptl/sysdeps/s390/tls.h
nptl/sysdeps/sh/tls.h
nptl/sysdeps/sparc/tls.h
nptl/sysdeps/unix/sysv/linux/fork.c
nptl/sysdeps/unix/sysv/linux/rtld-lowlevel.h
nptl/sysdeps/unix/sysv/linux/unregister-atfork.c
nptl/sysdeps/x86_64/tls.h

index 145fe0a..ddf91e5 100644 (file)
@@ -951,7 +951,7 @@ __nptl_setxid (struct xid_command *cmdp)
   int cur = cmdp->cntr;
   while (cur != 0)
     {
-      lll_private_futex_wait (&cmdp->cntr, cur);
+      lll_futex_wait (&cmdp->cntr, cur, LLL_PRIVATE);
       cur = cmdp->cntr;
     }
 
@@ -1037,7 +1037,7 @@ __wait_lookup_done (void)
        continue;
 
       do
-       lll_private_futex_wait (gscope_flagp, THREAD_GSCOPE_FLAG_WAIT);
+       lll_futex_wait (gscope_flagp, THREAD_GSCOPE_FLAG_WAIT, LLL_PRIVATE);
       while (*gscope_flagp == THREAD_GSCOPE_FLAG_WAIT);
     }
 
@@ -1059,7 +1059,7 @@ __wait_lookup_done (void)
        continue;
 
       do
-       lll_private_futex_wait (gscope_flagp, THREAD_GSCOPE_FLAG_WAIT);
+       lll_futex_wait (gscope_flagp, THREAD_GSCOPE_FLAG_WAIT, LLL_PRIVATE);
       while (*gscope_flagp == THREAD_GSCOPE_FLAG_WAIT);
     }
 
index a1aec6b..95b9c7b 100644 (file)
@@ -216,7 +216,7 @@ sighandler_setxid (int sig, siginfo_t *si, void *ctx)
                        __xidcmd->id[1], __xidcmd->id[2]);
 
   if (atomic_decrement_val (&__xidcmd->cntr) == 0)
-    lll_private_futex_wake (&__xidcmd->cntr, 1);
+    lll_futex_wake (&__xidcmd->cntr, 1, LLL_PRIVATE);
 
   /* Reset the SETXID flag.  */
   struct pthread *self = THREAD_SELF;
@@ -225,7 +225,7 @@ sighandler_setxid (int sig, siginfo_t *si, void *ctx)
 
   /* And release the futex.  */
   self->setxid_futex = 1;
-  lll_private_futex_wake (&self->setxid_futex, 1);
+  lll_futex_wake (&self->setxid_futex, 1, LLL_PRIVATE);
 }
 
 
index b1f852d..ca55903 100644 (file)
@@ -385,7 +385,7 @@ start_thread (void *arg)
       /* Some other thread might call any of the setXid functions and expect
         us to reply.  In this case wait until we did that.  */
       do
-       lll_private_futex_wait (&pd->setxid_futex, 0);
+       lll_futex_wait (&pd->setxid_futex, 0, LLL_PRIVATE);
       while (pd->cancelhandling & SETXID_BITMASK);
 
       /* Reset the value so that the stack can be reused.  */
index 388a399..e77b1ff 100644 (file)
@@ -131,7 +131,7 @@ typedef struct
        = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag,             \
                               THREAD_GSCOPE_FLAG_UNUSED);                   \
       if (__res == THREAD_GSCOPE_FLAG_WAIT)                                 \
-       lll_private_futex_wake (&THREAD_SELF->header.gscope_flag, 1);        \
+       lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE);   \
     }                                                                       \
   while (0)
 #define THREAD_GSCOPE_SET_FLAG() \
index 1ffd4cf..b512742 100644 (file)
@@ -449,7 +449,7 @@ union user_desc_init
                    : "i" (offsetof (struct pthread, header.gscope_flag)),    \
                      "0" (THREAD_GSCOPE_FLAG_UNUSED));                       \
       if (__res == THREAD_GSCOPE_FLAG_WAIT)                                  \
-       lll_private_futex_wake (&THREAD_SELF->header.gscope_flag, 1);         \
+       lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE);    \
     }                                                                        \
   while (0)
 #define THREAD_GSCOPE_SET_FLAG() \
index a5b7b76..936ff01 100644 (file)
@@ -173,7 +173,7 @@ register struct pthread *__thread_self __asm__("r13");
        = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag,             \
                               THREAD_GSCOPE_FLAG_UNUSED);                   \
       if (__res == THREAD_GSCOPE_FLAG_WAIT)                                 \
-       lll_private_futex_wake (&THREAD_SELF->header.gscope_flag, 1);        \
+       lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE);   \
     }                                                                       \
   while (0)
 #define THREAD_GSCOPE_SET_FLAG() \
index 06c60e8..0f4d529 100644 (file)
@@ -190,7 +190,7 @@ register void *__thread_register __asm__ ("r13");
        = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag,             \
                               THREAD_GSCOPE_FLAG_UNUSED);                   \
       if (__res == THREAD_GSCOPE_FLAG_WAIT)                                 \
-       lll_private_futex_wake (&THREAD_SELF->header.gscope_flag, 1);        \
+       lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE);   \
     }                                                                       \
   while (0)
 #define THREAD_GSCOPE_SET_FLAG() \
index 25ab74e..f36825e 100644 (file)
@@ -30,7 +30,7 @@
 #define AIO_MISC_NOTIFY(waitlist) \
   do {                                                                       \
     if (*waitlist->counterp > 0 && --*waitlist->counterp == 0)               \
-      lll_private_futex_wake (waitlist->counterp, 1);                        \
+      lll_futex_wake (waitlist->counterp, 1, LLL_PRIVATE);                   \
   } while (0)
 
 #define AIO_MISC_WAIT(result, futex, timeout, cancel)                        \
@@ -49,8 +49,8 @@
        int status;                                                           \
        do                                                                    \
          {                                                                   \
-           status = lll_private_futex_timed_wait (futexaddr, oldval,         \
-                                                  timeout);                  \
+           status = lll_futex_timed_wait (futexaddr, oldval, timeout,        \
+                                          LLL_PRIVATE);                      \
            if (status != -EWOULDBLOCK)                                       \
              break;                                                          \
                                                                              \
index 5f69900..0a2686c 100644 (file)
@@ -31,7 +31,7 @@
 #define GAI_MISC_NOTIFY(waitlist) \
   do {                                                                       \
     if (*waitlist->counterp > 0 && --*waitlist->counterp == 0)               \
-      lll_private_futex_wake (waitlist->counterp, 1);                        \
+      lll_futex_wake (waitlist->counterp, 1, LLL_PRIVATE);                   \
   } while (0)
 
 #define GAI_MISC_WAIT(result, futex, timeout, cancel) \
@@ -50,8 +50,8 @@
        int status;                                                           \
        do                                                                    \
          {                                                                   \
-           status = lll_private_futex_timed_wait (futexaddr, oldval,         \
-                                                  timeout);                  \
+           status = lll_futex_timed_wait (futexaddr, oldval, timeout,        \
+                                          LLL_PRIVATE);                      \
            if (status != -EWOULDBLOCK)                                       \
              break;                                                          \
                                                                              \
index f10db8f..3be459e 100644 (file)
@@ -183,7 +183,7 @@ typedef struct
        = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag,             \
                               THREAD_GSCOPE_FLAG_UNUSED);                   \
       if (__res == THREAD_GSCOPE_FLAG_WAIT)                                 \
-       lll_private_futex_wake (&THREAD_SELF->header.gscope_flag, 1);        \
+       lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE);   \
     }                                                                       \
   while (0)
 #define THREAD_GSCOPE_SET_FLAG() \
index e07e29f..a2d4d56 100644 (file)
@@ -164,7 +164,7 @@ typedef struct
        = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag,             \
                               THREAD_GSCOPE_FLAG_UNUSED);                   \
       if (__res == THREAD_GSCOPE_FLAG_WAIT)                                 \
-       lll_private_futex_wake (&THREAD_SELF->header.gscope_flag, 1);        \
+       lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE);   \
     }                                                                       \
   while (0)
 #define THREAD_GSCOPE_SET_FLAG() \
index c4741c8..601b537 100644 (file)
@@ -157,7 +157,7 @@ register struct pthread *__thread_self __asm__("%g7");
        = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag,             \
                               THREAD_GSCOPE_FLAG_UNUSED);                   \
       if (__res == THREAD_GSCOPE_FLAG_WAIT)                                 \
-       lll_private_futex_wake (&THREAD_SELF->header.gscope_flag, 1);        \
+       lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE);   \
     }                                                                       \
   while (0)
 #define THREAD_GSCOPE_SET_FLAG() \
index c6dadb5..f9913c3 100644 (file)
@@ -203,7 +203,7 @@ __libc_fork (void)
 
          if (atomic_decrement_and_test (&allp->handler->refcntr)
              && allp->handler->need_signal)
-           lll_private_futex_wake (allp->handler->refcntr, 1);
+           lll_futex_wake (allp->handler->refcntr, 1, LLL_PRIVATE);
 
          allp = allp->next;
        }
index 1aeff8f..4a49925 100644 (file)
        int val = word;                                                       \
        if (val == 0)                                                         \
          break;                                                              \
-       lll_private_futex_wait (&(word), val);                                \
+       lll_futex_wait (&(word), val, LLL_PRIVATE);                           \
       }                                                                              \
   } while (0)
 
 
 #define __rtld_notify(word) \
-  lll_private_futex_wake (&(word), 1)
+  lll_futex_wake (&(word), 1, LLL_PRIVATE)
 
 #endif
index 240ce59..bc5b753 100644 (file)
@@ -104,7 +104,7 @@ __unregister_atfork (dso_handle)
       atomic_decrement (&deleted->handler->refcntr);
       unsigned int val;
       while ((val = deleted->handler->refcntr) != 0)
-       lll_private_futex_wait (&deleted->handler->refcntr, val);
+       lll_futex_wait (&deleted->handler->refcntr, val, LLL_PRIVATE);
 
       deleted = deleted->next;
     }
index 029848a..79db61c 100644 (file)
@@ -355,7 +355,7 @@ typedef struct
                    : "i" (offsetof (struct pthread, header.gscope_flag)),    \
                      "0" (THREAD_GSCOPE_FLAG_UNUSED));                       \
       if (__res == THREAD_GSCOPE_FLAG_WAIT)                                  \
-       lll_private_futex_wake (&THREAD_SELF->header.gscope_flag, 1);         \
+       lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE);    \
     }                                                                        \
   while (0)
 #define THREAD_GSCOPE_SET_FLAG() \