Use unix epoch timestamps (oblador#71)

Author: oblador

packages/react-native-performance/android/src/main/java/com/oblador/performance/PerformanceModule.java

@@ -1,6 +1,5 @@
 package com.oblador.performance;
 
-import android.os.SystemClock;
 import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Arguments;
@@ -13,6 +12,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.lang.System;
 
 public class PerformanceModule extends ReactContextBaseJavaModule {
     public static final String PERFORMANCE_MODULE = "RNPerformanceManager";
@@ -34,7 +34,7 @@ public static void setupListener() {
                     switch (name) {
                         case RELOAD:
                             markBuffer.clear();
-                            markBuffer.put(BRIDGE_SETUP_START, SystemClock.uptimeMillis());
+                            markBuffer.put(BRIDGE_SETUP_START, System.currentTimeMillis());
                             break;
                         case ATTACH_MEASURED_ROOT_VIEWS_END:
                         case ATTACH_MEASURED_ROOT_VIEWS_START:
@@ -67,7 +67,7 @@ public static void setupListener() {
                         case SETUP_REACT_CONTEXT_END:
                         case SETUP_REACT_CONTEXT_START:
                         case VM_INIT:
-                            long startTime = SystemClock.uptimeMillis();
+                            long startTime = System.currentTimeMillis();
                             markBuffer.put(getMarkName(name), startTime);
                             break;
 
@@ -143,7 +143,7 @@ private void emit(String eventName,
                       long startTime) {
         WritableMap params = Arguments.createMap();
         params.putString("name", name);
-        params.putInt("startTime", (int) startTime);
+        params.putDouble("startTime", startTime);
         getReactApplicationContext()
                 .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                 .emit(eventName, params);

packages/react-native-performance/android/src/main/java/com/oblador/performance/StartTimeProvider.java

@@ -6,7 +6,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Process;
-import android.os.SystemClock;
+import java.lang.System;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -41,7 +41,7 @@ private static void setStartTime() {
 
     private static void setEndTime() {
         if (endTime == 0) {
-            endTime = SystemClock.uptimeMillis();
+            endTime = System.currentTimeMillis();
         }
     }
 

packages/react-native-performance/ios/RNPerformanceManager.m

@@ -1,11 +1,13 @@
 #import "RNPerformanceManager.h"
 #import <sys/sysctl.h>
 #include <math.h>
+#include <chrono>
 #import <QuartzCore/QuartzCore.h>
 #import <React/RCTRootView.h>
 #import <React/RCTPerformanceLogger.h>
 
-static CFTimeInterval getProcessStartTime() {
+static CFTimeInterval getProcessStartTime()
+{
     size_t len = 4;
     int mib[len];
     struct kinfo_proc kp;
@@ -19,6 +21,11 @@ static CFTimeInterval getProcessStartTime() {
     return startTime.tv_sec + startTime.tv_usec / 1e6;
 }
 
+static int64_t getTimestamp()
+{
+    return std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1);
+}
+
 static int64_t sNativeLaunchStart;
 static int64_t sNativeLaunchEnd;
 
@@ -32,9 +39,8 @@ @implementation RNPerformanceManager
 + (void) initialize
 {
     [super initialize];
-    CFTimeInterval absoluteTimeToRelativeTime =  CACurrentMediaTime() - [NSDate date].timeIntervalSince1970;
-    sNativeLaunchStart = (getProcessStartTime() + absoluteTimeToRelativeTime) * 1000;
-    sNativeLaunchEnd = CACurrentMediaTime() * 1000;
+    sNativeLaunchStart = (getProcessStartTime() - [NSDate date].timeIntervalSince1970) * 1000 + getTimestamp();
+    sNativeLaunchEnd = getTimestamp();
 }
 
 - (void)setBridge:(RCTBridge *)bridge
@@ -49,7 +55,7 @@ - (void)setBridge:(RCTBridge *)bridge
 
 - (void)contentDidAppear
 {
-    int64_t startTime = CACurrentMediaTime() * 1000;
+    int64_t startTime = getTimestamp();
     [self emitMarkNamed:@"nativeLaunchStart" withStartTime:sNativeLaunchStart];
     [self emitMarkNamed:@"nativeLaunchEnd" withStartTime:sNativeLaunchEnd];
     [self emitTag:RCTPLScriptDownload withNamePrefix:@"download"];
@@ -66,6 +72,7 @@ - (void)contentDidAppear
 
 - (void)invalidate
 {
+    [super invalidate];
     NSNotificationCenter *notificationCenter = NSNotificationCenter.defaultCenter;
     [notificationCenter removeObserver:self];
 }
@@ -88,6 +95,7 @@ - (void)emitTag:(RCTPLTag)tag withNamePrefix:(NSString *)namePrefix
         NSLog(@"Ignoring marks prefixed %@ (%lu) as data is unavailable (duration: %lld, end: %lld)", namePrefix, (unsigned long)tag, duration, end);
         return;
     }
+    end += getTimestamp() - (CACurrentMediaTime() * 1000);
     [self emitMarkNamed:[namePrefix stringByAppendingString:@"Start"] withStartTime:end-duration];
     [self emitMarkNamed:[namePrefix stringByAppendingString:@"End"] withStartTime:end];
 }
@@ -107,7 +115,7 @@ - (void)emitMetricNamed:(NSString *)name withValue:(NSNumber *)value
     if (hasListeners) {
         [self sendEventWithName:@"metric" body:@{
             @"name": name,
-            @"startTime": @(CACurrentMediaTime() * 1000),
+            @"startTime": @(getTimestamp()),
             @"value": value
         }];
     }

packages/react-native-performance/ios/react-native-performance.podspec

@@ -11,8 +11,8 @@ Pod::Spec.new do |s|
   s.license      = package['license']
   s.source       = { :git => 'https://github.com/oblador/react-native-performance.git', :tag => "v#{s.version}" }
 
-  s.platform     = :ios, "9.0"
-  s.source_files = "**/*.{h,m}"
+  s.platform     = :ios, "11.0"
+  s.source_files = "**/*.{h,m,mm}"
 
   s.dependency 'React-Core'
 end