diff options
Diffstat (limited to 'libviengoos/viengoos/futex.h')
-rw-r--r-- | libviengoos/viengoos/futex.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libviengoos/viengoos/futex.h b/libviengoos/viengoos/futex.h index b9f23c9..0c97a5a 100644 --- a/libviengoos/viengoos/futex.h +++ b/libviengoos/viengoos/futex.h @@ -119,9 +119,9 @@ struct vg_futex_return static inline struct vg_futex_return __attribute__((always_inline)) -vg_futex_using (struct hurd_message_buffer *mb, - void *addr1, int op, int val1, struct timespec *timespec, - void *addr2, int val3) +futex_using (struct hurd_message_buffer *mb, + void *addr1, int op, int val1, struct timespec *timespec, + void *addr2, int val3) { union futex_val2 val2; if (timespec) @@ -132,7 +132,7 @@ vg_futex_using (struct hurd_message_buffer *mb, error_t err; long ret = 0; /* Elide gcc warning. */ if (mb) - err = rm_futex_using (mb, + err = vg_futex_using (mb, VG_ADDR_VOID, VG_ADDR_VOID, addr1, op, val1, !! timespec, val2, addr2, (union futex_val3) val3, &ret); @@ -143,24 +143,24 @@ vg_futex_using (struct hurd_message_buffer *mb, return (struct vg_futex_return) { err, ret }; } -/* Standard vg_futex signatures. See vg_futex documentation, e.g., Futexes +/* Standard futex signatures. See futex documentation, e.g., Futexes are Tricky by Ulrich Drepper. */ static inline struct vg_futex_return __attribute__((always_inline)) -vg_futex (void *addr1, int op, int val1, struct timespec *timespec, +futex (void *addr1, int op, int val1, struct timespec *timespec, void *addr2, int val3) { - return vg_futex_using (NULL, addr1, op, val1, timespec, addr2, val3); + return futex_using (NULL, addr1, op, val1, timespec, addr2, val3); } /* If *F is VAL, wait until woken. */ static inline long __attribute__((always_inline)) -vg_futex_wait_using (struct hurd_message_buffer *mb, int *f, int val) +futex_wait_using (struct hurd_message_buffer *mb, int *f, int val) { struct vg_futex_return ret; - ret = vg_futex_using (mb, f, FUTEX_WAIT, val, NULL, 0, 0); + ret = futex_using (mb, f, FUTEX_WAIT, val, NULL, 0, 0); if (ret.err) { errno = ret.err; @@ -173,7 +173,7 @@ static inline long __attribute__((always_inline)) futex_wait (int *f, int val) { - return vg_futex_wait_using (NULL, f, val); + return futex_wait_using (NULL, f, val); } @@ -183,7 +183,7 @@ __attribute__((always_inline)) futex_timed_wait (int *f, int val, struct timespec *timespec) { struct vg_futex_return ret; - ret = vg_futex (f, FUTEX_WAIT, val, timespec, 0, 0); + ret = futex (f, FUTEX_WAIT, val, timespec, 0, 0); if (ret.err) { errno = ret.err; @@ -196,10 +196,10 @@ futex_timed_wait (int *f, int val, struct timespec *timespec) /* Signal NWAKE waiters waiting on vg_futex F. */ static inline long __attribute__((always_inline)) -vg_futex_wake_using (struct hurd_message_buffer *mb, int *f, int nwake) +futex_wake_using (struct hurd_message_buffer *mb, int *f, int nwake) { struct vg_futex_return ret; - ret = vg_futex_using (mb, f, FUTEX_WAKE, nwake, NULL, 0, 0); + ret = futex_using (mb, f, FUTEX_WAKE, nwake, NULL, 0, 0); if (ret.err) { errno = ret.err; @@ -212,7 +212,7 @@ static inline long __attribute__((always_inline)) futex_wake (int *f, int nwake) { - return vg_futex_wake_using (NULL, f, nwake); + return futex_wake_using (NULL, f, nwake); } #endif /* !RM_INTERN */ |