From d7fc58f32ca1cb39c6239906d115eb2352162626 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Mon, 13 Jun 2016 04:16:19 -0700 Subject: [PATCH] Add RCT_PROFILE define Reviewed By: tadeuzagallo Differential Revision: D3423593 fbshipit-source-id: cc04add1bee16fbb4c2491bd229f23244fe3e7bd --- React/Base/RCTDefines.h | 10 +++++----- React/Executors/RCTJSCExecutor.mm | 4 +++- React/Profiler/RCTJSCProfiler.m | 10 ++++------ React/Profiler/RCTProfile.h | 2 +- React/Profiler/RCTProfile.m | 2 +- React/Profiler/RCTProfileTrampoline-arm.S | 2 +- React/Profiler/RCTProfileTrampoline-arm64.S | 2 +- React/Profiler/RCTProfileTrampoline-i386.S | 2 +- React/Profiler/RCTProfileTrampoline-x86_64.S | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/React/Base/RCTDefines.h b/React/Base/RCTDefines.h index afc0320c3d..ffb7591f89 100644 --- a/React/Base/RCTDefines.h +++ b/React/Base/RCTDefines.h @@ -50,16 +50,16 @@ #define RCT_IF_DEV(...) #endif +#ifndef RCT_PROFILE +#define RCT_PROFILE RCT_DEV +#endif + /** * By default, only raise an NSAssertion in debug mode * (custom assert functions will still be called). */ #ifndef RCT_NSASSERT -#if RCT_DEBUG -#define RCT_NSASSERT 1 -#else -#define RCT_NSASSERT 0 -#endif +#define RCT_NSASSERT RCT_DEBUG #endif /** diff --git a/React/Executors/RCTJSCExecutor.mm b/React/Executors/RCTJSCExecutor.mm index a65cd36c48..25272fd782 100644 --- a/React/Executors/RCTJSCExecutor.mm +++ b/React/Executors/RCTJSCExecutor.mm @@ -389,7 +389,7 @@ static void RCTInstallJSCProfiler(RCTBridge *bridge, JSContextRef context) return @(CACurrentMediaTime() * 1000); }]; -#if RCT_DEV +#if RCT_PROFILE if (RCTProfileIsProfiling()) { // Cheating, since it's not a "hook", but meh [self addSynchronousHookWithName:@"__RCTProfileIsProfiling" usingBlock:@YES]; @@ -468,7 +468,9 @@ static void RCTInstallJSCProfiler(RCTBridge *bridge, JSContextRef context) name:event object:nil]; } +#endif +#if RCT_DEV // Inject handler used by HMR [self addSynchronousHookWithName:@"nativeInjectHMRUpdate" usingBlock:^(NSString *sourceCode, NSString *sourceCodeURL) { RCTJSCExecutor *strongSelf = weakSelf; diff --git a/React/Profiler/RCTJSCProfiler.m b/React/Profiler/RCTJSCProfiler.m index fc0a21fff8..7ae2a2b2f5 100644 --- a/React/Profiler/RCTJSCProfiler.m +++ b/React/Profiler/RCTJSCProfiler.m @@ -8,15 +8,13 @@ */ #import "RCTJSCProfiler.h" -#import "RCTLog.h" + #import +#import "RCTLog.h" + #ifndef RCT_JSC_PROFILER - #if RCT_DEV - #define RCT_JSC_PROFILER 1 - #else - #define RCT_JSC_PROFILER 0 - #endif +#define RCT_JSC_PROFILER RCT_PROFILE #endif #if RCT_JSC_PROFILER diff --git a/React/Profiler/RCTProfile.h b/React/Profiler/RCTProfile.h index 17a6001a17..fb3cca7e72 100644 --- a/React/Profiler/RCTProfile.h +++ b/React/Profiler/RCTProfile.h @@ -26,7 +26,7 @@ RCT_EXTERN NSString *const RCTProfileDidEndProfiling; RCT_EXTERN const uint64_t RCTProfileTagAlways; -#if RCT_DEV +#if RCT_PROFILE @class RCTBridge; diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m index a2aa37cae8..01cf350a8f 100644 --- a/React/Profiler/RCTProfile.m +++ b/React/Profiler/RCTProfile.m @@ -34,7 +34,7 @@ NSString *const RCTProfileDidEndProfiling = @"RCTProfileDidEndProfiling"; const uint64_t RCTProfileTagAlways = 1L << 0; -#if RCT_DEV +#if RCT_PROFILE #pragma mark - Constants diff --git a/React/Profiler/RCTProfileTrampoline-arm.S b/React/Profiler/RCTProfileTrampoline-arm.S index d52c778799..99ac6498b2 100644 --- a/React/Profiler/RCTProfileTrampoline-arm.S +++ b/React/Profiler/RCTProfileTrampoline-arm.S @@ -10,7 +10,7 @@ #include "RCTDefines.h" #include "RCTMacros.h" -#if RCT_DEV && defined(__arm__) +#if RCT_PROFILE && defined(__arm__) .thumb .thumb_func diff --git a/React/Profiler/RCTProfileTrampoline-arm64.S b/React/Profiler/RCTProfileTrampoline-arm64.S index 435d86a4d5..30ce4a0482 100644 --- a/React/Profiler/RCTProfileTrampoline-arm64.S +++ b/React/Profiler/RCTProfileTrampoline-arm64.S @@ -10,7 +10,7 @@ #include "RCTDefines.h" #include "RCTMacros.h" -#if RCT_DEV && defined(__arm64__) +#if RCT_PROFILE && defined(__arm64__) .align 5 .globl SYMBOL_NAME(RCTProfileTrampoline) diff --git a/React/Profiler/RCTProfileTrampoline-i386.S b/React/Profiler/RCTProfileTrampoline-i386.S index 7aed481325..7faba77426 100644 --- a/React/Profiler/RCTProfileTrampoline-i386.S +++ b/React/Profiler/RCTProfileTrampoline-i386.S @@ -10,7 +10,7 @@ #include "RCTDefines.h" #include "RCTMacros.h" -#if RCT_DEV && defined(__i386__) +#if RCT_PROFILE && defined(__i386__) .globl SYMBOL_NAME(RCTProfileTrampoline) SYMBOL_NAME(RCTProfileTrampoline): diff --git a/React/Profiler/RCTProfileTrampoline-x86_64.S b/React/Profiler/RCTProfileTrampoline-x86_64.S index 6d9c93fb7c..c473c362a9 100644 --- a/React/Profiler/RCTProfileTrampoline-x86_64.S +++ b/React/Profiler/RCTProfileTrampoline-x86_64.S @@ -10,7 +10,7 @@ #include "RCTDefines.h" #include "RCTMacros.h" -#if RCT_DEV && defined(__x86_64__) +#if RCT_PROFILE && defined(__x86_64__) .globl SYMBOL_NAME(RCTProfileTrampoline) SYMBOL_NAME(RCTProfileTrampoline):