From b7fe8e68be35843f5284bacf89decdf7e1cab88c Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Fri, 13 May 2016 17:15:00 -0700
Subject: [PATCH] Finer granularity systracing

Reviewed By: astreet

Differential Revision: D3234826

fbshipit-source-id: 900ab93b847949413a134a87a20b0d826c58da3d
---
 ReactCommon/bridge/JSCExecutor.cpp | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/ReactCommon/bridge/JSCExecutor.cpp b/ReactCommon/bridge/JSCExecutor.cpp
index 2d1ed987c..fdc23c5d6 100644
--- a/ReactCommon/bridge/JSCExecutor.cpp
+++ b/ReactCommon/bridge/JSCExecutor.cpp
@@ -177,6 +177,11 @@ void JSCExecutor::destroy() {
 }
 
 void JSCExecutor::initOnJSVMThread() {
+  #ifdef WITH_FBSYSTRACE
+  FbSystraceSection s(
+    TRACE_TAG_REACT_CXX_BRIDGE, "JSCExecutor.initOnJSVMThread");
+  #endif
+
   #if defined(WITH_FB_JSC_TUNING)
   configureJSCForAndroid(m_jscConfig);
   #endif
@@ -236,15 +241,26 @@ void JSCExecutor::terminateOnJSVMThread() {
 void JSCExecutor::loadApplicationScript(
     const std::string& script,
     const std::string& sourceURL) {
-  ReactMarker::logMarker("loadApplicationScript_startStringConvert");
-  String jsScript = String::createExpectingAscii(script);
-  ReactMarker::logMarker("loadApplicationScript_endStringConvert");
-
-  String jsSourceURL(sourceURL.c_str());
   #ifdef WITH_FBSYSTRACE
   FbSystraceSection s(TRACE_TAG_REACT_CXX_BRIDGE, "JSCExecutor::loadApplicationScript",
     "sourceURL", sourceURL);
   #endif
+
+  #ifdef WITH_FBSYSTRACE
+  fbsystrace_begin_section(
+    TRACE_TAG_REACT_CXX_BRIDGE,
+    "JSCExecutor::loadApplicationScript-createExpectingAscii");
+  #endif
+
+  ReactMarker::logMarker("loadApplicationScript_startStringConvert");
+  String jsScript = String::createExpectingAscii(script);
+  ReactMarker::logMarker("loadApplicationScript_endStringConvert");
+
+  #ifdef WITH_FBSYSTRACE
+  fbsystrace_end_section(TRACE_TAG_REACT_CXX_BRIDGE);
+  #endif
+
+  String jsSourceURL(sourceURL.c_str());
   evaluateScript(m_context, jsScript, jsSourceURL);
   flush();
   ReactMarker::logMarker("CREATE_REACT_CONTEXT_END");