Stop SystraceMessage markers with SystraceMessage.endSection

Reviewed By: javache

Differential Revision: D5182628

fbshipit-source-id: f5112a434cb7564410b0e2e69840e45a0777a184

Author: Michał Gregorczyk

ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java

@@ -20,7 +20,6 @@
 import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
 
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
@@ -82,7 +81,7 @@ public final List<NativeModule> createNativeModules(ReactApplicationContext reac
         nativeModule = holder.getProvider().get();
       } finally {
         ReactMarker.logMarker(ReactMarkerConstants.CREATE_MODULE_END);
-        Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+        SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
       }
       modules.add(nativeModule);
     }

ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -1023,6 +1023,6 @@ private void processPackage(
     if (reactPackage instanceof ReactPackageLogger) {
       ((ReactPackageLogger) reactPackage).endProcessPackage();
     }
-    Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+    SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
   }
 }

ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java

@@ -230,14 +230,20 @@ private void processArguments() {
     SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "processArguments")
       .arg("method", mModuleWrapper.getName() + "." + mMethod.getName())
       .flush();
-    mArgumentsProcessed = true;
-    mArgumentExtractors = buildArgumentExtractors(mParameterTypes);
-    mSignature = buildSignature(mMethod, mParameterTypes, (mType.equals(BaseJavaModule.METHOD_TYPE_SYNC)));
-    // Since native methods are invoked from a message queue executed on a single thread, it is
-    // safe to allocate only one arguments object per method that can be reused across calls
-    mArguments = new Object[mParameterTypes.length];
-    mJSArgumentsNeeded = calculateJSArgumentsNeeded();
-    com.facebook.systrace.Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+    try {
+      mArgumentsProcessed = true;
+      mArgumentExtractors = buildArgumentExtractors(mParameterTypes);
+      mSignature = buildSignature(
+          mMethod,
+          mParameterTypes,
+          (mType.equals(BaseJavaModule.METHOD_TYPE_SYNC)));
+      // Since native methods are invoked from a message queue executed on a single thread, it is
+      // safe to allocate only one arguments object per method that can be reused across calls
+      mArguments = new Object[mParameterTypes.length];
+      mJSArgumentsNeeded = calculateJSArgumentsNeeded();
+    } finally {
+      SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
+    }
   }
 
   public Method getMethod() {
@@ -368,7 +374,7 @@ public void invoke(JSInstance jsInstance, ReadableNativeArray parameters) {
         throw new RuntimeException("Could not invoke " + traceName, ite);
       }
     } finally {
-      com.facebook.systrace.Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+      SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
     }
   }
 

ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java

@@ -153,7 +153,7 @@ public List<MethodDescriptor> getMethodDescriptors() {
       Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
 
       ReactMarker.logMarker(GET_CONSTANTS_END);
-      Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+      SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
     }
   }
 

ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java

@@ -11,7 +11,6 @@
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
 
 import static com.facebook.infer.annotation.Assertions.assertNotNull;
@@ -170,8 +169,8 @@ private NativeModule create() {
         doInitialize(module);
       }
     } finally {
-      Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
       ReactMarker.logMarker(CREATE_MODULE_END, instanceKey);
+      SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
     }
     return module;
   }
@@ -200,7 +199,7 @@ private void doInitialize(NativeModule module) {
       }
     } finally {
       ReactMarker.logMarker(ReactMarkerConstants.INITIALIZE_MODULE_END);
-      Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+      SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
     }
   }
 }