Record real process and thread ids

packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt

@@ -67,6 +67,7 @@ add_react_common_subdir(cxxreact)
 add_react_common_subdir(jsc)
 add_react_common_subdir(jsi)
 add_react_common_subdir(callinvoker)
+add_react_common_subdir(oscompat)
 add_react_common_subdir(jsinspector-modern)
 add_react_common_subdir(jsinspector-modern/tracing)
 add_react_common_subdir(hermes/executor)
@@ -169,6 +170,7 @@ add_library(reactnative
           $<TARGET_OBJECTS:jsireact>
           $<TARGET_OBJECTS:logger>
           $<TARGET_OBJECTS:mapbufferjni>
+          $<TARGET_OBJECTS:oscompat>
           $<TARGET_OBJECTS:react_bridging>
           $<TARGET_OBJECTS:react_codegen_rncore>
           $<TARGET_OBJECTS:react_cxxreact>

packages/react-native/ReactCommon/jsinspector-modern/tracing/CMakeLists.txt

@@ -23,4 +23,5 @@ target_include_directories(jsinspector_tracing PUBLIC ${REACT_COMMON_DIR})
 
 target_link_libraries(jsinspector_tracing
         folly_runtime
+        oscompat
 )

packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp

@@ -7,21 +7,16 @@
 
 #include "PerformanceTracer.h"
 
+#include <oscompat/OSCompat.h>
+
 #include <folly/json.h>
 
 #include <mutex>
-#include <unordered_set>
 
 namespace facebook::react::jsinspector_modern {
 
 namespace {
 
-/** Process ID for all emitted events. */
-const uint64_t PID = 1000;
-
-/** Default/starting track ID for the "Timings" track. */
-const uint64_t USER_TIMINGS_DEFAULT_TRACK = 1000;
-
 uint64_t getUnixTimestampOfNow() {
   return std::chrono::duration_cast<std::chrono::microseconds>(
              std::chrono::steady_clock::now().time_since_epoch())
@@ -35,6 +30,9 @@ PerformanceTracer& PerformanceTracer::getInstance() {
   return tracer;
 }
 
+PerformanceTracer::PerformanceTracer()
+    : processId_(oscompat::getCurrentProcessId()) {}
+
 bool PerformanceTracer::startTracing() {
   std::lock_guard lock(mutex_);
   if (tracing_) {
@@ -46,8 +44,8 @@ bool PerformanceTracer::startTracing() {
       .cat = "disabled-by-default-devtools.timeline",
       .ph = 'I',
       .ts = getUnixTimestampOfNow(),
-      .pid = PID, // FIXME: This should be the real process ID.
-      .tid = 0, // FIXME: This should be the real thread ID.
+      .pid = processId_,
+      .tid = oscompat::getCurrentThreadId(),
       .args = folly::dynamic::object("data", folly::dynamic::object()),
   });
 
@@ -106,9 +104,8 @@ void PerformanceTracer::reportMark(
       .cat = "blink.user_timing",
       .ph = 'I',
       .ts = start,
-      .pid = PID, // FIXME: This should be the real process ID.
-      .tid = USER_TIMINGS_DEFAULT_TRACK, // FIXME: This should be the real
-                                         // thread ID.
+      .pid = processId_,
+      .tid = oscompat::getCurrentThreadId(),
   });
 }
 
@@ -132,15 +129,15 @@ void PerformanceTracer::reportMeasure(
   }
 
   ++performanceMeasureCount_;
+  auto currentThreadId = oscompat::getCurrentThreadId();
   buffer_.push_back(TraceEvent{
       .id = performanceMeasureCount_,
       .name = std::string(name),
       .cat = "blink.user_timing",
       .ph = 'b',
       .ts = start,
-      .pid = PID, // FIXME: This should be the real process ID.
-      .tid = USER_TIMINGS_DEFAULT_TRACK, // FIXME: This should be the real
-                                         // thread ID.
+      .pid = processId_,
+      .tid = currentThreadId,
       .args = beginEventArgs,
   });
   buffer_.push_back(TraceEvent{
@@ -149,9 +146,8 @@ void PerformanceTracer::reportMeasure(
       .cat = "blink.user_timing",
       .ph = 'e',
       .ts = start + duration,
-      .pid = PID, // FIXME: This should be the real process ID.
-      .tid = USER_TIMINGS_DEFAULT_TRACK, // FIXME: This should be the real
-                                         // thread ID.
+      .pid = processId_,
+      .tid = currentThreadId,
   });
 }
 

packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h

@@ -14,7 +14,6 @@
 
 #include <functional>
 #include <optional>
-#include <unordered_map>
 #include <vector>
 
 namespace facebook::react::jsinspector_modern {
@@ -68,14 +67,15 @@ class PerformanceTracer {
       const std::optional<DevToolsTrackEntryPayload>& trackMetadata);
 
  private:
-  PerformanceTracer() = default;
+  PerformanceTracer();
   PerformanceTracer(const PerformanceTracer&) = delete;
   PerformanceTracer& operator=(const PerformanceTracer&) = delete;
   ~PerformanceTracer() = default;
 
   folly::dynamic serializeTraceEvent(TraceEvent event) const;
 
   bool tracing_{false};
+  uint64_t processId_;
   uint32_t performanceMeasureCount_{0};
   std::vector<TraceEvent> buffer_;
   std::mutex mutex_;

packages/react-native/ReactCommon/jsinspector-modern/tracing/React-jsinspectortracing.podspec

@@ -53,4 +53,5 @@ Pod::Spec.new do |s|
   end
 
   s.dependency "RCT-Folly"
+  s.dependency "React-oscompat"
 end

packages/react-native/ReactCommon/oscompat/CMakeLists.txt

@@ -0,0 +1,14 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions)
+
+file(GLOB oscompat_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(oscompat OBJECT ${oscompat_SRC})
+
+target_include_directories(oscompat PUBLIC .)

packages/react-native/ReactCommon/oscompat/OSCompat.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <cstdint>
+
+namespace facebook::react::oscompat {
+
+uint64_t getCurrentProcessId();
+
+uint64_t getCurrentThreadId();
+
+} // namespace facebook::react::oscompat

packages/react-native/ReactCommon/oscompat/OSCompatPosix.cpp

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#if defined(__linux__) || (defined(__APPLE__) && defined(__MACH__)) || \
+    defined(__ANDROID__)
+
+#include "OSCompat.h"
+
+#include <cassert>
+
+#include <pthread.h>
+#include <unistd.h>
+
+#if defined(__MACH__)
+#include <mach/mach.h>
+#endif // defined(__MACH__)
+
+#if defined(__linux__)
+#include <sys/syscall.h>
+#endif // defined(__linux__)
+
+namespace facebook::react::oscompat {
+
+uint64_t getCurrentProcessId() {
+  return getpid();
+}
+
+#if defined(__APPLE__) && defined(__MACH__)
+
+uint64_t getCurrentThreadId() {
+  uint64_t tid = 0;
+  auto ret = pthread_threadid_np(nullptr, &tid);
+  assert(
+      ret == 0 &&
+      "Unexpected pthread_threadid_np failure while getting thread ID");
+  (void)ret;
+  return tid;
+}
+
+#elif defined(__ANDROID__)
+
+uint64_t getCurrentThreadId() {
+  return gettid();
+}
+
+#elif defined(__linux__)
+
+uint64_t getCurrentThreadId() {
+  return syscall(__NR_gettid);
+}
+
+#else
+#error "getCurrentThreadID() is not supported on this platform"
+#endif
+
+} // namespace facebook::react::oscompat
+
+#endif // defined(__linux__) || (defined(__APPLE__) && defined(__MACH__)) ||
+       // defined(__ANDROID__)

packages/react-native/ReactCommon/oscompat/OSCompatWindows.cpp

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#if defined(_WIN32) || defined(_MSC_VER)
+
+#include "OSCompat.h"
+
+#include <windows.h>
+
+namespace facebook::react::oscompat {
+
+uint64_t getCurrentProcessId() {
+  return GetCurrentProcessId();
+}
+
+uint64_t getCurrentThreadId() {
+  return GetCurrentThreadId();
+}
+
+} // namespace facebook::react::oscompat
+
+#endif // defined(_WIN32) || defined(_MSC_VER)

packages/react-native/ReactCommon/oscompat/React-oscompat.podspec

@@ -0,0 +1,31 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
+version = package['version']
+
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
+else
+  source[:tag] = "v#{version}"
+end
+
+Pod::Spec.new do |s|
+  s.name                   = "React-oscompat"
+  s.version                = version
+  s.summary                = "Small set of OS-level utilities for React Native"
+  s.homepage               = "https://reactnative.dev/"
+  s.license                = package["license"]
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
+  s.platforms              = min_supported_versions
+  s.source                 = source
+  s.source_files           = "*.{cpp,h}"
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "" }
+  s.header_dir             = "oscompat"
+end

packages/react-native/scripts/cocoapods/utils.rb

@@ -635,6 +635,7 @@ def self.react_native_pods
             "React-jsinspector",
             "React-jsitooling",
             "React-logger",
+            "React-oscompat",
             "React-perflogger",
             "React-rncore",
             "React-runtimeexecutor",

packages/react-native/scripts/react_native_pods.rb

@@ -156,6 +156,7 @@ def use_react_native! (
   pod 'React-rendererdebug', :path => "#{prefix}/ReactCommon/react/renderer/debug"
   pod 'React-rendererconsistency', :path => "#{prefix}/ReactCommon/react/renderer/consistency"
   pod 'React-perflogger', :path => "#{prefix}/ReactCommon/reactperflogger"
+  pod 'React-oscompat', :path => "#{prefix}/ReactCommon/oscompat"
   pod 'React-logger', :path => "#{prefix}/ReactCommon/logger"
   pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon", :modular_headers => true
   pod 'React-NativeModulesApple', :path => "#{prefix}/ReactCommon/react/nativemodule/core/platform/ios", :modular_headers => true

packages/rn-tester/Podfile.lock

@@ -1342,6 +1342,7 @@ PODS:
     - React-runtimeexecutor (= 1000.0.0)
   - React-jsinspectortracing (1000.0.0):
     - RCT-Folly
+    - React-oscompat
   - React-jsitracing (1000.0.0):
     - React-jsi
   - React-logger (1000.0.0):
@@ -1367,6 +1368,7 @@ PODS:
     - React-runtimeexecutor
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
+  - React-oscompat (1000.0.0)
   - React-perflogger (1000.0.0):
     - DoubleConversion
     - RCT-Folly (= 2024.11.18.00)
@@ -1743,6 +1745,7 @@ DEPENDENCIES:
   - React-Mapbuffer (from `../react-native/ReactCommon`)
   - React-microtasksnativemodule (from `../react-native/ReactCommon/react/nativemodule/microtasks`)
   - React-NativeModulesApple (from `../react-native/ReactCommon/react/nativemodule/core/platform/ios`)
+  - React-oscompat (from `../react-native/ReactCommon/oscompat`)
   - React-perflogger (from `../react-native/ReactCommon/reactperflogger`)
   - React-performancetimeline (from `../react-native/ReactCommon/react/performance/timeline`)
   - React-RCTActionSheet (from `../react-native/Libraries/ActionSheetIOS`)
@@ -1866,6 +1869,8 @@ EXTERNAL SOURCES:
     :path: "../react-native/ReactCommon/react/nativemodule/microtasks"
   React-NativeModulesApple:
     :path: "../react-native/ReactCommon/react/nativemodule/core/platform/ios"
+  React-oscompat:
+    :path: "../react-native/ReactCommon/oscompat"
   React-perflogger:
     :path: "../react-native/ReactCommon/reactperflogger"
   React-performancetimeline:
@@ -1970,12 +1975,13 @@ SPEC CHECKSUMS:
   React-jsi: 640bb3438e3abab16c87c00b164dcb6157302538
   React-jsiexecutor: 0188eeb6c71752c8a80ebad427449297dff78509
   React-jsinspector: 31bf1f65aa86b42aa3258485b98e51a3c9b6dac3
-  React-jsinspectortracing: 969209ebbedc4e3d94e1c30b823ce866ab10c849
+  React-jsinspectortracing: 3ff2c35be750be3ba11bb52af4ad1efa78e1d758
   React-jsitracing: ce443686f52538d1033ce7db1e7d643e866262f0
   React-logger: eeb704f8f8197d565c420c2de7be03576dace972
   React-Mapbuffer: cd5e7720cb5fd9c0bc43ae71a952cc2a16711a5a
   React-microtasksnativemodule: 6af4b5b26640a12f9abc421a014f300d2a02b789
   React-NativeModulesApple: 612e7d0ccf461840f010689daa86fd058aec01c5
+  React-oscompat: 7133e0e945cda067ae36b22502df663d73002864
   React-perflogger: 6f2b10b96094d29e1dca6be7689d975b98ba4166
   React-performancetimeline: b91e898716885df30697e54eab3eb14f6b48766b
   React-RCTActionSheet: 1bf8cc8086ad1c15da3407dfb7bc9dd94dc7595d