Enable perf monitor for CxxBridge

Reviewed By: javache

Differential Revision: D4510939

fbshipit-source-id: f90dc5c97b98ce68cb2c21e5f283790880b032a4

React/Profiler/RCTPerfMonitor.m

@@ -142,11 +142,8 @@ RCT_EXPORT_MODULE()
 {
   _bridge = bridge;
 
-  // TODO: enable on cxx bridge
-  if ([_bridge isKindOfClass:[RCTBatchedBridge class]]) {
   [_bridge.devMenu addItem:self.devMenuItem];
 }
-}
 
 - (void)invalidate
 {
@@ -322,8 +319,6 @@ RCT_EXPORT_MODULE()
   [_uiDisplayLink addToRunLoop:[NSRunLoop mainRunLoop]
                        forMode:NSRunLoopCommonModes];
 
-  id<RCTJavaScriptExecutor> executor = [_bridge valueForKey:@"javaScriptExecutor"];
-  if ([executor isKindOfClass:[RCTJSCExecutor class]]) {
   self.container.frame = (CGRect) {
     self.container.frame.origin, {
       self.container.frame.size.width + 44,
@@ -332,13 +327,13 @@ RCT_EXPORT_MODULE()
   };
   [self.container addSubview:self.jsGraph];
   [self.container addSubview:self.jsGraphLabel];
-    [executor executeBlockOnJavaScriptQueue:^{
+
+  [_bridge dispatchBlock:^{
     self->_jsDisplayLink = [CADisplayLink displayLinkWithTarget:self
                                                        selector:@selector(threadUpdate:)];
     [self->_jsDisplayLink addToRunLoop:[NSRunLoop currentRunLoop]
                                forMode:NSRunLoopCommonModes];
-    }];
+  } queue:RCTJSThread];
-  }
 }
 
 - (void)hide
@@ -424,7 +419,7 @@ RCT_EXPORT_MODULE()
   static NSRegularExpression *GCRegex;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    NSString *pattern = @"\\[GC: (Eden|Full)Collection, (?:Skipped copying|Did copy), ([\\d\\.]+) (\\wb), ([\\d.]+) (\\ws)\\]";
+    NSString *pattern = @"\\[GC: [\\d\\.]+ \\wb => (Eden|Full)Collection, (?:Skipped copying|Did copy), ([\\d\\.]+) \\wb, [\\d.]+ \\ws\\]";
     GCRegex = [NSRegularExpression regularExpressionWithPattern:pattern
                                                         options:0
                                                           error:nil];