projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Don't override user variables within the build system
[urcu.git]
/
tests
/
common
/
thread-id.h
diff --git
a/tests/common/thread-id.h
b/tests/common/thread-id.h
index 72613333b2ab0ddb482a6fd486fb6c51a9d0ca9f..96f1f59ad9ee0d3a7983d5055f8380edfe4a922b 100644
(file)
--- a/
tests/common/thread-id.h
+++ b/
tests/common/thread-id.h
@@
-17,10
+17,17
@@
* provided the above notices are retained, and a notice that the code was
* modified is included with the above copyright notice.
*/
* provided the above notices are retained, and a notice that the code was
* modified is included with the above copyright notice.
*/
+
#ifdef __linux__
# include <urcu/syscall-compat.h>
#ifdef __linux__
# include <urcu/syscall-compat.h>
-# if defined(_syscall0)
+# if defined(HAVE_GETTID)
+/*
+ * Do not redefine gettid() as it is already included
+ * in bionic through <unistd.h>. Some other libc
+ * may also already contain an implementation of gettid.
+ */
+# elif defined(_syscall0)
_syscall0(pid_t, gettid)
# elif defined(__NR_gettid)
static inline pid_t gettid(void)
_syscall0(pid_t, gettid)
# elif defined(__NR_gettid)
static inline pid_t gettid(void)
@@
-42,11
+49,14
@@
unsigned long urcu_get_thread_id(void)
{
return (unsigned long) pthread_getthreadid_np();
}
{
return (unsigned long) pthread_getthreadid_np();
}
-#elif defined(__Android__)
-/*
- * Do not redefine gettid() as it is already included
- * in bionic through <unistd.h>.
- */
+#elif defined(__sun__) || defined(__APPLE__)
+#include <pthread.h>
+
+static inline
+unsigned long urcu_get_thread_id(void)
+{
+ return (unsigned long) pthread_self();
+}
#else
# warning "use pid as thread ID"
static inline
#else
# warning "use pid as thread ID"
static inline
This page took
0.023611 seconds
and
4
git commands to generate.