commit ed59fd491877ad83c8f009e1e5d2b6a40c22b9c6
author Christopher N. Hesse <raymanfx@gmail.com> Mon Oct 23 20:35:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 23 20:35:20 2017 +0000
tree 1813a75e0addeb15fdfa48273b6138d148d7a71a
parent bfcf6a958c07803ee9a56cf46ff96ff02c572a24
parent 7b65534e5c8eba193169c88232b73b3313395960

Merge "libcutils: Fix thread ID on macOS" am: 6958506e82
am: bdee15ef71

Change-Id: Iac6a73e1b7dfb387cd53798824575ca29b24ee04

base/logging.cpp

diff --git a/base/logging.cpp b/base/logging.cpp
index 6357b4b..75078e5 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -80,7 +80,9 @@
 #if defined(__BIONIC__)
   return gettid();
 #elif defined(__APPLE__)
-  return syscall(SYS_thread_selfid);
+  uint64_t tid;
+  pthread_threadid_np(NULL, &tid);
+  return tid;
 #elif defined(__linux__)
   return syscall(__NR_gettid);
 #elif defined(_WIN32)

libcutils/threads.c

diff --git a/libcutils/threads.c b/libcutils/threads.c
index 036f8c5..4bae39e 100644
--- a/libcutils/threads.c
+++ b/libcutils/threads.c
@@ -35,7 +35,9 @@
 #ifndef __ANDROID__
 pid_t gettid() {
 #if defined(__APPLE__)
-  return syscall(SYS_thread_selfid);
+  uint64_t tid;
+  pthread_threadid_np(NULL, &tid);
+  return tid;
 #elif defined(__linux__)
   return syscall(__NR_gettid);
 #elif defined(_WIN32)