commit c4e913c839719566fcef35a4a9ce5997ea78af83
author Ryan Macnak <rmacnak@google.com> Tue Mar 22 22:41:50 2022 +0000
committer Commit Bot <commit-bot@chromium.org> Tue Mar 22 22:41:50 2022 +0000
tree 42f955b3efd8a3b98479f4daaf70bfdbedd7fb08
parent 05a6506c9231812d81c809098b337a45f486d098

[vm] Further make [os_]thread_absl.cc compatible with Mac.

TEST=ci, cbuild
Change-Id: I0fa9c11bbe826f71494cc9f7c89caed4f3597629
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/238161
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>

runtime/vm/dart_api_impl.h

diff --git a/runtime/vm/dart_api_impl.h b/runtime/vm/dart_api_impl.h
index bb5eda5..d38bf58 100644
--- a/runtime/vm/dart_api_impl.h
+++ b/runtime/vm/dart_api_impl.h
@@ -129,7 +129,7 @@
 #define API_TIMELINE_BEGIN_END(thread)                                         \
   do {                                                                         \
   } while (false)
-#endif  // !PRODUCT
+#endif  // SUPPORT_TIMELINE
 
 class Api : AllStatic {
  public:

runtime/vm/os_thread.h

diff --git a/runtime/vm/os_thread.h b/runtime/vm/os_thread.h
index 5df7fb2..e125847 100644
--- a/runtime/vm/os_thread.h
+++ b/runtime/vm/os_thread.h
@@ -253,7 +253,7 @@
   static void Cleanup();
 #ifdef SUPPORT_TIMELINE
   static ThreadId GetCurrentThreadTraceId();
-#endif  // PRODUCT
+#endif  // SUPPORT_TIMELINE
   static OSThread* GetOSThreadFromThread(ThreadState* thread);
   static void AddThreadToListLocked(OSThread* thread);
   static void RemoveThreadFromList(OSThread* thread);

runtime/vm/os_thread_absl.cc

diff --git a/runtime/vm/os_thread_absl.cc b/runtime/vm/os_thread_absl.cc
index 15d6c33..e5887c3 100644
--- a/runtime/vm/os_thread_absl.cc
+++ b/runtime/vm/os_thread_absl.cc
@@ -219,9 +219,15 @@
 
 #ifdef SUPPORT_TIMELINE
 ThreadId OSThread::GetCurrentThreadTraceId() {
+#if defined(DART_HOST_OS_ANDROID)
+  return GetCurrentThreadId();
+#elif defined(DART_HOST_OS_LINUX)
   return syscall(__NR_gettid);
+#elif defined(DART_HOST_OS_MACOS)
+  return ThreadIdFromIntPtr(pthread_mach_thread_np(pthread_self()));
+#endif
 }
-#endif  // PRODUCT
+#endif  // SUPPORT_TIMELINE
 
 ThreadJoinId OSThread::GetCurrentThreadJoinId(OSThread* thread) {
   ASSERT(thread != NULL);

runtime/vm/os_thread_android.cc

diff --git a/runtime/vm/os_thread_android.cc b/runtime/vm/os_thread_android.cc
index a9a1413..a55dd95 100644
--- a/runtime/vm/os_thread_android.cc
+++ b/runtime/vm/os_thread_android.cc
@@ -215,7 +215,7 @@
 ThreadId OSThread::GetCurrentThreadTraceId() {
   return GetCurrentThreadId();
 }
-#endif  // PRODUCT
+#endif  // SUPPORT_TIMELINE
 
 ThreadJoinId OSThread::GetCurrentThreadJoinId(OSThread* thread) {
   ASSERT(thread != NULL);

runtime/vm/os_thread_fuchsia.cc

diff --git a/runtime/vm/os_thread_fuchsia.cc b/runtime/vm/os_thread_fuchsia.cc
index 3cf8193..5e47b4e 100644
--- a/runtime/vm/os_thread_fuchsia.cc
+++ b/runtime/vm/os_thread_fuchsia.cc
@@ -170,7 +170,7 @@
 ThreadId OSThread::GetCurrentThreadTraceId() {
   return pthread_self();
 }
-#endif  // PRODUCT
+#endif  // SUPPORT_TIMELINE
 
 ThreadJoinId OSThread::GetCurrentThreadJoinId(OSThread* thread) {
   ASSERT(thread != NULL);

runtime/vm/os_thread_linux.cc

diff --git a/runtime/vm/os_thread_linux.cc b/runtime/vm/os_thread_linux.cc
index ea44790..8c6368b 100644
--- a/runtime/vm/os_thread_linux.cc
+++ b/runtime/vm/os_thread_linux.cc
@@ -216,7 +216,7 @@
 ThreadId OSThread::GetCurrentThreadTraceId() {
   return syscall(__NR_gettid);
 }
-#endif  // PRODUCT
+#endif  // SUPPORT_TIMELINE
 
 ThreadJoinId OSThread::GetCurrentThreadJoinId(OSThread* thread) {
   ASSERT(thread != NULL);

runtime/vm/os_thread_macos.cc

diff --git a/runtime/vm/os_thread_macos.cc b/runtime/vm/os_thread_macos.cc
index cbbc226..7931ee7 100644
--- a/runtime/vm/os_thread_macos.cc
+++ b/runtime/vm/os_thread_macos.cc
@@ -194,7 +194,7 @@
 ThreadId OSThread::GetCurrentThreadTraceId() {
   return ThreadIdFromIntPtr(pthread_mach_thread_np(pthread_self()));
 }
-#endif  // PRODUCT
+#endif  // SUPPORT_TIMELINE
 
 ThreadJoinId OSThread::GetCurrentThreadJoinId(OSThread* thread) {
   ASSERT(thread != NULL);

runtime/vm/os_thread_win.cc

diff --git a/runtime/vm/os_thread_win.cc b/runtime/vm/os_thread_win.cc
index 49eda86..98c95ed 100644
--- a/runtime/vm/os_thread_win.cc
+++ b/runtime/vm/os_thread_win.cc
@@ -133,7 +133,7 @@
 ThreadId OSThread::GetCurrentThreadTraceId() {
   return ::GetCurrentThreadId();
 }
-#endif  // PRODUCT
+#endif  // SUPPORT_TIMELINE
 
 ThreadJoinId OSThread::GetCurrentThreadJoinId(OSThread* thread) {
   ASSERT(thread != NULL);

runtime/vm/timeline.h

diff --git a/runtime/vm/timeline.h b/runtime/vm/timeline.h
index 94998ca..6d5c062 100644
--- a/runtime/vm/timeline.h
+++ b/runtime/vm/timeline.h
@@ -547,7 +547,7 @@
 #define TIMELINE_DURATION(thread, stream, name)
 #define TIMELINE_FUNCTION_COMPILATION_DURATION(thread, name, function)
 #define TIMELINE_FUNCTION_GC_DURATION(thread, name)
-#endif  // !PRODUCT
+#endif  // SUPPORT_TIMELINE
 
 // See |TimelineBeginEndScope|.
 class TimelineEventScope : public StackResource {