Add missing license to UnimplementedView.js

Summary:
Added a missing license header to UnimplementedView.js

No code logic got changed, just added a comment. So the regular CircleCI tests should be fine.
Closes #13952

Differential Revision: D5056778

Pulled By: javache

fbshipit-source-id: feb106946a9a34cfdf2df63de21305ac779296f4

Improve systrace markers

Reviewed By: mhorowitz

Differential Revision: D4860135

fbshipit-source-id: ce963010883e6b9cc8e34f7ff01b4018cd195eba

Author: Arsen Ghazaryan

Libraries/Components/UnimplementedViews/UnimplementedView.js

@@ -1,15 +1,23 @@
 /**
- * Common implementation for a simple stubbed view. Simply applies the view's styles to the inner
- * View component and renders its children.
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @providesModule UnimplementedView
+ * @flow
  */
-
 'use strict';
 
 var React = require('React');
 var StyleSheet = require('StyleSheet');
 
+/**
+ * Common implementation for a simple stubbed view. Simply applies the view's styles to the inner
+ * View component and renders its children.
+ */
 class UnimplementedView extends React.Component {
   setNativeProps = () => {
     // Do nothing.

React/CxxBridge/RCTCxxBridge.mm

@@ -54,7 +54,7 @@ @interface RCTCxxBridge : RCTBridge
   RCTAssert(self.executorClass || self->_jsThread == [NSThread currentThread], \
             @"This method must be called on JS thread")
 
-NSString *const RCTJSThreadName = @"com.facebook.React.JavaScript";
+static NSString *const RCTJSThreadName = @"com.facebook.react.JavaScript";
 
 using namespace facebook::react;
 
@@ -76,7 +76,7 @@ static bool isRAMBundle(NSData *script) {
 
 static void registerPerformanceLoggerHooks(RCTPerformanceLogger *performanceLogger) {
   __weak RCTPerformanceLogger *weakPerformanceLogger = performanceLogger;
-  ReactMarker::logTaggedMarker = [weakPerformanceLogger](const ReactMarker::ReactMarkerId markerId, const char* tag) {
+  ReactMarker::logTaggedMarker = [weakPerformanceLogger](const ReactMarker::ReactMarkerId markerId, const char *tag) {
     switch (markerId) {
       case ReactMarker::RUN_JS_BUNDLE_START:
         [weakPerformanceLogger markStartForTag:RCTPLScriptExecution];
@@ -255,6 +255,8 @@ - (void)executeBlockOnJavaScriptThread:(dispatch_block_t)block
 
 - (void)start
 {
+  RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTCxxBridge start]", nil);
+
   [[NSNotificationCenter defaultCenter]
     postNotificationName:RCTJavaScriptWillStartLoadingNotification
     object:_parentBridge userInfo:@{@"bridge": self}];
@@ -349,6 +351,7 @@ - (void)start
       }
     });
   }
+  RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
 }
 
 - (void)loadSource:(RCTSourceLoadBlock)_onSourceLoad onProgress:(RCTSourceLoadProgressBlock)onProgress
@@ -963,7 +966,7 @@ - (void)_flushPendingCalls
 
   [_performanceLogger markStopForTag:RCTPLBridgeStartup];
 
-  RCT_PROFILE_BEGIN_EVENT(0, @"Processing pendingCalls", @{ @"count": @(_pendingCalls.count) });
+  RCT_PROFILE_BEGIN_EVENT(0, @"Processing pendingCalls", @{ @"count": [@(_pendingCalls.count) stringValue] });
   // Phase B: _flushPendingCalls happens.  Each block in _pendingCalls is
   // executed, adding work to the queue, and _pendingCount is decremented.
   // loading is set to NO.
@@ -1051,8 +1054,7 @@ - (void)enqueueApplicationScript:(NSData *)script
 {
   RCTAssert(onComplete != nil, @"onComplete block passed in should be non-nil");
 
-  RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways,
-                          @"-[RCTCxxBridge enqueueApplicationScript]", nil);
+  RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTCxxBridge enqueueApplicationScript]", nil);
 
   [self _tryAndHandleError:^{
     if (isRAMBundle(script)) {

React/CxxModule/RCTNativeModule.h

@@ -20,7 +20,7 @@ class RCTNativeModule : public NativeModule {
   std::string getName() override;
   std::vector<MethodDescriptor> getMethods() override;
   folly::dynamic getConstants() override;
-  void invoke(unsigned int methodId, folly::dynamic &&params) override;
+  void invoke(unsigned int methodId, folly::dynamic &&params, int callId) override;
   MethodCallResult callSerializableNativeHook(unsigned int reactMethodId, folly::dynamic &&params) override;
 
  private:

React/CxxModule/RCTNativeModule.mm

@@ -17,6 +17,10 @@
 #import <React/RCTProfile.h>
 #import <React/RCTUtils.h>
 
+#ifdef WITH_FBSYSTRACE
+#include <fbsystrace.h>
+#endif
+
 namespace facebook {
 namespace react {
 
@@ -50,20 +54,20 @@
   return ret;
 }
 
-void RCTNativeModule::invoke(unsigned int methodId, folly::dynamic &&params) {
+void RCTNativeModule::invoke(unsigned int methodId, folly::dynamic &&params, int callId) {
   // The BatchedBridge version of this buckets all the callbacks by thread, and
   // queues one block on each.  This is much simpler; we'll see how it goes and
   // iterate.
-  dispatch_block_t block = [this, methodId, params=std::move(params)] {
-    if (!m_bridge.valid) {
-      return;
+  dispatch_block_t block = [this, methodId, params=std::move(params), callId] {
+    #ifdef WITH_FBSYSTRACE
+    if (callId != -1) {
+      fbsystrace_end_async_flow(TRACE_TAG_REACT_APPS, "native", callId);
     }
-
+    #endif
     invokeInner(methodId, std::move(params));
   };
 
   dispatch_queue_t queue = m_moduleData.methodQueue;
-
   if (queue == RCTJSThread) {
     block();
   } else if (queue) {
@@ -76,14 +80,17 @@
 }
 
 MethodCallResult RCTNativeModule::invokeInner(unsigned int methodId, const folly::dynamic &&params) {
+  if (!m_bridge.valid) {
+    return folly::none;
+  }
+
   id<RCTBridgeMethod> method = m_moduleData.methods[methodId];
   if (RCT_DEBUG && !method) {
     RCTLogError(@"Unknown methodID: %ud for module: %@",
                 methodId, m_moduleData.name);
   }
 
   NSArray *objcParams = convertFollyDynamicToId(params);
-
   @try {
     id result = [method invokeWithBridge:m_bridge module:m_moduleData.instance arguments:objcParams];
     return convertIdToFollyDynamic(result);
@@ -99,7 +106,6 @@
                          exception, method.JSMethodName, m_moduleData.name, objcParams];
     RCTFatal(RCTErrorWithMessage(message));
   }
-
 }
 
 }

React/Modules/RCTUIManager.m

@@ -32,8 +32,8 @@
 #import "RCTRootViewInternal.h"
 #import "RCTScrollableProtocol.h"
 #import "RCTShadowView.h"
-#import "RCTUtils.h"
 #import "RCTUIManagerObserverCoordinator.h"
+#import "RCTUtils.h"
 #import "RCTView.h"
 #import "RCTViewManager.h"
 #import "UIView+React.h"
@@ -1192,7 +1192,7 @@ - (void)flushUIBlocks
     dispatch_async(dispatch_get_main_queue(), ^{
       RCTProfileEndFlowEvent();
       RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[UIManager flushUIBlocks]", (@{
-        @"count": @(previousPendingUIBlocks.count),
+        @"count": [@(previousPendingUIBlocks.count) stringValue],
       }));
       @try {
         for (RCTViewManagerUIBlock block in previousPendingUIBlocks) {
@@ -1202,6 +1202,7 @@ - (void)flushUIBlocks
       @catch (NSException *exception) {
         RCTLogError(@"Exception thrown while executing UI block: %@", exception);
       }
+      RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
     });
   }
 }

React/Profiler/RCTProfile.h

@@ -68,7 +68,7 @@ RCT_EXTERN void _RCTProfileBeginEvent(NSThread *calleeThread,
                                       NSTimeInterval time,
                                       uint64_t tag,
                                       NSString *name,
-                                      NSDictionary *args);
+                                      NSDictionary<NSString *, NSString *> *args);
 #define RCT_PROFILE_BEGIN_EVENT(tag, name, args) \
   do { \
     if (RCTProfileIsProfiling()) { \
@@ -104,7 +104,7 @@ RCT_EXTERN void _RCTProfileEndEvent(NSThread *calleeThread,
  */
 RCT_EXTERN NSUInteger RCTProfileBeginAsyncEvent(uint64_t tag,
                                                 NSString *name,
-                                                NSDictionary *args);
+                                                NSDictionary<NSString *, NSString *> *args);
 
 /**
  * The ID returned by BeginEvent should then be passed into EndEvent, with the

React/Profiler/RCTProfile.m

@@ -71,22 +71,19 @@
 static RCTProfileCallbacks *callbacks;
 static char *systrace_buffer;
 
-static systrace_arg_t *RCTProfileSystraceArgsFromNSDictionary(NSDictionary *args)
+static systrace_arg_t *systraceArgsFromDictionary(NSDictionary<NSString *, NSString *> *args)
 {
   if (args.count == 0) {
     return NULL;
   }
 
   systrace_arg_t *systrace_args = malloc(sizeof(systrace_arg_t) * args.count);
   __block size_t i = 0;
-  [args enumerateKeysAndObjectsUsingBlock:^(id key, id value, __unused BOOL *stop) {
-    const char *keyc = [key description].UTF8String;
-    systrace_args[i].key = keyc;
-    systrace_args[i].key_len = (int)strlen(keyc);
-
-    const char *valuec = RCTJSONStringify(value, NULL).UTF8String;
-    systrace_args[i].value = valuec;
-    systrace_args[i].value_len = (int)strlen(valuec);
+  [args enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, __unused BOOL *stop) {
+    systrace_args[i].key = [key UTF8String];
+    systrace_args[i].key_len = [key length];
+    systrace_args[i].value = [value UTF8String];
+    systrace_args[i].value_len = [value length];
     i++;
   }];
   return systrace_args;
@@ -123,7 +120,7 @@ void RCTProfileRegisterCallbacks(RCTProfileCallbacks *cb)
                                  TASK_BASIC_INFO,
                                  (task_info_t)&info,
                                  &size);
-  if( kerr == KERN_SUCCESS ) {
+  if ( kerr == KERN_SUCCESS ) {
     return @{
       @"suspend_count": @(info.suspend_count),
       @"virtual_size": RCTProfileMemory(info.virtual_size),
@@ -545,12 +542,12 @@ void _RCTProfileBeginEvent(
   NSTimeInterval time,
   uint64_t tag,
   NSString *name,
-  NSDictionary *args
+  NSDictionary<NSString *, NSString *> *args
 ) {
   CHECK();
 
   if (callbacks != NULL) {
-    callbacks->begin_section(tag, name.UTF8String, args.count, RCTProfileSystraceArgsFromNSDictionary(args));
+    callbacks->begin_section(tag, name.UTF8String, args.count, systraceArgsFromDictionary(args));
     return;
   }
 
@@ -603,7 +600,7 @@ void _RCTProfileEndEvent(
 NSUInteger RCTProfileBeginAsyncEvent(
   uint64_t tag,
   NSString *name,
-  NSDictionary *args
+  NSDictionary<NSString *, NSString *> *args
 ) {
   CHECK(0);
 
@@ -613,7 +610,8 @@ NSUInteger RCTProfileBeginAsyncEvent(
   NSUInteger currentEventID = ++eventID;
 
   if (callbacks != NULL) {
-    callbacks->begin_async_section(tag, name.UTF8String, (int)(currentEventID % INT_MAX), args.count, RCTProfileSystraceArgsFromNSDictionary(args));
+    callbacks->begin_async_section(tag, name.UTF8String, (int)(currentEventID % INT_MAX),
+                                   args.count, systraceArgsFromDictionary(args));
   } else {
     dispatch_async(RCTProfileGetQueue(), ^{
       RCTProfileOngoingEvents[@(currentEventID)] = @[

ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.cpp

@@ -10,6 +10,10 @@
 #include <cxxreact/JsArgumentHelpers.h>
 #include <cxxreact/NativeModule.h>
 
+#ifdef WITH_FBSYSTRACE
+#include <fbsystrace.h>
+#endif
+
 #include "CatalystInstanceImpl.h"
 #include "ReadableNativeArray.h"
 
@@ -80,9 +84,14 @@ folly::dynamic JavaNativeModule::getConstants() {
   }
 }
 
-void JavaNativeModule::invoke(unsigned int reactMethodId, folly::dynamic&& params) {
-  messageQueueThread_->runOnQueue([this, reactMethodId, params=std::move(params)] {
+void JavaNativeModule::invoke(unsigned int reactMethodId, folly::dynamic&& params, int callId) {
+  messageQueueThread_->runOnQueue([this, reactMethodId, params=std::move(params), callId] {
     static auto invokeMethod = wrapper_->getClass()->getMethod<void(jint, ReadableNativeArray::javaobject)>("invoke");
+    #ifdef WITH_FBSYSTRACE
+    if (callId != -1) {
+      fbsystrace_end_async_flow(TRACE_TAG_REACT_APPS, "native", callId);
+    }
+    #endif
     invokeMethod(
       wrapper_,
       static_cast<jint>(reactMethodId),
@@ -148,13 +157,18 @@ folly::dynamic NewJavaNativeModule::getConstants() {
   }
 }
 
-void NewJavaNativeModule::invoke(unsigned int reactMethodId, folly::dynamic&& params) {
+void NewJavaNativeModule::invoke(unsigned int reactMethodId, folly::dynamic&& params, int callId) {
   if (reactMethodId >= methods_.size()) {
     throw std::invalid_argument(
       folly::to<std::string>("methodId ", reactMethodId, " out of range [0..", methods_.size(), "]"));
   }
   CHECK(!methods_[reactMethodId].isSyncHook()) << "Trying to invoke a synchronous hook asynchronously";
-  messageQueueThread_->runOnQueue([this, reactMethodId, params=std::move(params)] () mutable {
+  messageQueueThread_->runOnQueue([this, reactMethodId, params=std::move(params), callId] () mutable {
+    #ifdef WITH_FBSYSTRACE
+    if (callId != -1) {
+      fbsystrace_end_async_flow(TRACE_TAG_REACT_APPS, "native", callId);
+    }
+    #endif
     invokeInner(reactMethodId, std::move(params));
   });
 }

ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.h

@@ -59,7 +59,7 @@ class JavaNativeModule : public NativeModule {
   std::string getName() override;
   folly::dynamic getConstants() override;
   std::vector<MethodDescriptor> getMethods() override;
-  void invoke(unsigned int reactMethodId, folly::dynamic&& params) override;
+  void invoke(unsigned int reactMethodId, folly::dynamic&& params, int callId) override;
   MethodCallResult callSerializableNativeHook(unsigned int reactMethodId, folly::dynamic&& params) override;
 
  private:
@@ -80,7 +80,7 @@ class NewJavaNativeModule : public NativeModule {
   std::string getName() override;
   std::vector<MethodDescriptor> getMethods() override;
   folly::dynamic getConstants() override;
-  void invoke(unsigned int reactMethodId, folly::dynamic&& params) override;
+  void invoke(unsigned int reactMethodId, folly::dynamic&& params, int callId) override;
   MethodCallResult callSerializableNativeHook(unsigned int reactMethodId, folly::dynamic&& params) override;
 
  private:

ReactCommon/cxxreact/CxxNativeModule.cpp

@@ -7,7 +7,8 @@
 
 #include <folly/json.h>
 
-#include <cxxreact/JsArgumentHelpers.h>
+#include "JsArgumentHelpers.h"
+#include "SystraceSection.h"
 
 using facebook::xplat::module::CxxModule;
 
@@ -75,7 +76,7 @@ folly::dynamic CxxNativeModule::getConstants() {
   return constants;
 }
 
-void CxxNativeModule::invoke(unsigned int reactMethodId, folly::dynamic&& params) {
+void CxxNativeModule::invoke(unsigned int reactMethodId, folly::dynamic&& params, int callId) {
   if (reactMethodId >= methods_.size()) {
     throw std::invalid_argument(folly::to<std::string>("methodId ", reactMethodId,
         " out of range [0..", methods_.size(), "]"));
@@ -128,7 +129,13 @@ void CxxNativeModule::invoke(unsigned int reactMethodId, folly::dynamic&& params
   // stack.  I'm told that will be possible in the future.  TODO
   // mhorowitz #7128529: convert C++ exceptions to Java
 
-  messageQueueThread_->runOnQueue([method, params=std::move(params), first, second] () {
+  messageQueueThread_->runOnQueue([method, params=std::move(params), first, second, callId] () {
+  #ifdef WITH_FBSYSTRACE
+    if (callId != -1) {
+      fbsystrace_end_async_flow(TRACE_TAG_REACT_APPS, "native", callId);
+    }
+  #endif
+    SystraceSection s(method.name.c_str());
     try {
       method.func(std::move(params), first, second);
     } catch (const facebook::xplat::JsArgumentException& ex) {