Cherry pick PR #3293: Migrate the SbThreadSampler to pthread (#3308)

Refer to the original PR: #3293 Test-On-Device: true b/340535150 Change-Id: I35a0a3e28304c3bfb7368640bd8589e654d9f588 Co-authored-by: Yavor Goulishev <[email protected]>
youtube · May 21, 2024 · 3a523bb · 3a523bb
1 parent 6b29508
commit 3a523bb
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 1 deletion.
diff --git a/starboard/CHANGELOG.md b/starboard/CHANGELOG.md
@@ -9,6 +9,9 @@ since the version previous to it.
 
 ## Version 16
 
+### Migrate the `SbThreadSampler` to use `pthread`.
+Switched the `SbThreadSampler` API to use `pthread` instead of `SbThread`.
+
 ### Added support for pthread create attributes.
 The standard pthread APIs `pthread_attr_init`, `pthread_attr_destroy`,
 `pthread_attr_getdetachstate`, `pthread_attr_getstacksize`,

diff --git a/starboard/nplb/thread_sampler_test.cc b/starboard/nplb/thread_sampler_test.cc
@@ -18,15 +18,24 @@
 #include "starboard/common/atomic.h"
 #include "starboard/common/log.h"
 #include "starboard/common/time.h"
+
+#if SB_API_VERSION < 16
 #include "starboard/nplb/thread_helpers.h"
+#else
+#include "starboard/nplb/posix_compliance/posix_thread_helpers.h"
+#endif
 #include "starboard/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace starboard {
 namespace nplb {
 namespace {
 
+#if SB_API_VERSION < 16
 class CountingThread : public AbstractTestThread {
+#else
+class CountingThread : public posix::AbstractTestThread {
+#endif
  public:
   ~CountingThread() { Stop(); }
 
@@ -64,7 +73,12 @@ TEST(ThreadSamplerTest, RainyDayCreateSamplerInvalidThread) {
   // Creating a sampler for an invalid thread should not succeed, and even
   // without without calling |SbThreadSamplerDelete| ASAN should not detect a
   // memory leak.
+
+#if SB_API_VERSION < 16
   SbThreadSampler sampler = SbThreadSamplerCreate(kSbThreadInvalid);
+#else
+  SbThreadSampler sampler = SbThreadSamplerCreate(0);
+#endif
   EXPECT_FALSE(SbThreadSamplerIsValid(sampler));
 }
 

diff --git a/starboard/shared/pthread/thread_sampler_create.cc b/starboard/shared/pthread/thread_sampler_create.cc
@@ -14,9 +14,18 @@
 
 #include "starboard/shared/pthread/thread_sampler_internal.h"
 
+#if SB_API_VERSION < 16
 SbThreadSampler SbThreadSamplerCreate(SbThread thread) {
   if (!SbThreadIsValid(thread)) {
     return kSbThreadSamplerInvalid;
   }
   return new SbThreadSamplerPrivate(thread);
 }
+#else
+SbThreadSampler SbThreadSamplerCreate(pthread_t thread) {
+  if (thread == 0) {
+    return kSbThreadSamplerInvalid;
+  }
+  return new SbThreadSamplerPrivate(thread);
+}
+#endif
diff --git a/starboard/shared/pthread/thread_sampler_internal.cc b/starboard/shared/pthread/thread_sampler_internal.cc
@@ -14,6 +14,7 @@
 
 #include "starboard/shared/pthread/thread_sampler_internal.h"
 
+#include <pthread.h>
 #include <semaphore.h>
 #include <signal.h>
 
@@ -129,7 +130,11 @@ void SignalHandler::HandleProfilerSignal(int signal,
 
 }  // namespace
 
+#if SB_API_VERSION < 16
 SbThreadSamplerPrivate::SbThreadSamplerPrivate(SbThread thread)
+#else
+SbThreadSamplerPrivate::SbThreadSamplerPrivate(pthread_t thread)
+#endif
     : thread_(thread) {
   SignalHandler::AddSampler();
 }

diff --git a/starboard/shared/pthread/thread_sampler_internal.h b/starboard/shared/pthread/thread_sampler_internal.h
@@ -15,20 +15,33 @@
 #ifndef STARBOARD_SHARED_PTHREAD_THREAD_SAMPLER_INTERNAL_H_
 #define STARBOARD_SHARED_PTHREAD_THREAD_SAMPLER_INTERNAL_H_
 
+#include <pthread.h>
+
 #include "starboard/thread.h"
 
 class SbThreadSamplerPrivate {
  public:
+#if SB_API_VERSION < 16
   explicit SbThreadSamplerPrivate(SbThread thread);
+#else
+  explicit SbThreadSamplerPrivate(pthread_t thread);
+#endif
   ~SbThreadSamplerPrivate();
 
   SbThreadContext Freeze();
   bool Thaw();
-
+#if SB_API_VERSION < 16
   SbThread thread() { return thread_; }
+#else
+  pthread_t thread() { return thread_; }
+#endif
 
  private:
+#if SB_API_VERSION < 16
   SbThread thread_;
+#else
+  pthread_t thread_;
+#endif
 };
 
 #endif  // STARBOARD_SHARED_PTHREAD_THREAD_SAMPLER_INTERNAL_H_
diff --git a/starboard/shared/stub/thread_sampler_create.cc b/starboard/shared/stub/thread_sampler_create.cc
@@ -15,7 +15,11 @@
 #include "starboard/common/log.h"
 #include "starboard/thread.h"
 
+#if SB_API_VERSION < 16
 SbThreadSampler SbThreadSamplerCreate(SbThread thread) {
+#else
+SbThreadSampler SbThreadSamplerCreate(pthread_t thread) {
+#endif
   SB_NOTIMPLEMENTED() << "Profiling is not supported on this platform.";
   return kSbThreadSamplerInvalid;
 }
diff --git a/starboard/thread.h b/starboard/thread.h
@@ -19,6 +19,8 @@
 #ifndef STARBOARD_THREAD_H_
 #define STARBOARD_THREAD_H_
 
+#include <pthread.h>
+
 #include "starboard/configuration.h"
 #include "starboard/export.h"
 #include "starboard/types.h"
@@ -333,7 +335,11 @@ SB_EXPORT bool SbThreadSamplerIsSupported();
 //
 // If successful, this function returns the newly created handle.
 // If unsuccessful, this function returns |kSbThreadSamplerInvalid|.
+#if SB_API_VERSION < 16
 SB_EXPORT SbThreadSampler SbThreadSamplerCreate(SbThread thread);
+#else
+SB_EXPORT SbThreadSampler SbThreadSamplerCreate(pthread_t thread);
+#endif
 
 // Destroys the |sampler| and frees whatever resources it was using.
 SB_EXPORT void SbThreadSamplerDestroy(SbThreadSampler sampler);

diff --git a/third_party/musl/src/include/pthread.h b/third_party/musl/src/include/pthread.h
@@ -3,6 +3,7 @@
 
 #include "../../include/pthread.h"
 
+#if !defined(STARBOARD)
 hidden int __pthread_once(pthread_once_t *, void (*)(void));
 hidden void __pthread_testcancel(void);
 hidden int __pthread_setcancelstate(int, int *);
@@ -25,5 +26,6 @@ hidden int __pthread_rwlock_wrlock(pthread_rwlock_t *);
 hidden int __pthread_rwlock_trywrlock(pthread_rwlock_t *);
 hidden int __pthread_rwlock_timedwrlock(pthread_rwlock_t *__restrict, const struct timespec *__restrict);
 hidden int __pthread_rwlock_unlock(pthread_rwlock_t *);
+#endif
 
 #endif
diff --git a/v8/src/libsampler/sampler.cc b/v8/src/libsampler/sampler.cc
@@ -176,7 +176,11 @@ namespace sampler {
 class Sampler::PlatformData {
  public:
   PlatformData()
+#if SB_API_VERSION < 16
       : thread_(SbThreadGetCurrent()),
+#else
+      : thread_(pthread_self()),
+#endif
         thread_sampler_(kSbThreadSamplerInvalid) {}
   ~PlatformData() { ReleaseThreadSampler(); }
 
@@ -195,7 +199,11 @@ class Sampler::PlatformData {
   }
 
  private:
+#if SB_API_VERSION < 16
   SbThread thread_;
+#else
+  pthread_t thread_;
+#endif
   SbThreadSampler thread_sampler_;
 };