diff options
authorRich Felker <>2013-02-01 16:41:53 -0500
committerRich Felker <>2013-02-01 16:41:53 -0500
commitfacc6acbfd20accea435d10fdd070b23877e40db (patch)
parent96fbcf7d80f469e39d1dd12533f8bb8d13b64fe5 (diff)
replace __wake function with macro that performs direct syscall
this should generate faster and smaller code, especially with inline syscalls. the conditional with cnt is ugly, but thankfully cnt is always a constant anyway so it gets evaluated at compile time. it may be preferable to make separate __wake and __wakeall macros without a count argument. priv flag is not used yet; private futex support still needs to be done at some point in the future.
2 files changed, 2 insertions, 10 deletions
diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index 4215e67a..544da9ce 100644
--- a/src/internal/pthread_impl.h
+++ b/src/internal/pthread_impl.h
@@ -106,7 +106,8 @@ void __unmapself(void *, size_t);
int __timedwait(volatile int *, int, clockid_t, const struct timespec *, void (*)(void *), void *, int);
void __wait(volatile int *, volatile int *, int, int);
-void __wake(volatile int *, int, int);
+#define __wake(addr, cnt, priv) \
+ __syscall(SYS_futex, addr, FUTEX_WAKE, (cnt)<0?INT_MAX:(cnt))
void __acquire_ptc();
void __release_ptc();
diff --git a/src/thread/__wake.c b/src/thread/__wake.c
deleted file mode 100644
index d8bf70f7..00000000
--- a/src/thread/__wake.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "pthread_impl.h"
-#include <limits.h>
-void __wake(volatile int *addr, int cnt, int priv)
- if (priv) priv = 128; priv=0;
- if (cnt<0) cnt = INT_MAX;
- __syscall(SYS_futex, (long)addr, FUTEX_WAKE | priv, cnt);