status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove needless weak self in RCTJSCExecutor 

Summary: There's no reason for this; setUp is once-and-done. Probably just trying to ignore the incorrect clang warning.

Reviewed By: javache

Differential Revision: D3528494

fbshipit-source-id: e4f986df8d097e4720dfd4a51e7fb6c9c9b5108f
This commit is contained in:
Adam Ernst 2016-07-08 09:08:34 -07:00 committed by Facebook Github Bot 2
parent 89a53b687c
commit 29f9be6d9c
1 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
React/Executors/RCTJSCExecutor.mm
View File

@ -330,15 +330,12 @@ static void RCTInstallJSCProfiler(RCTBridge *bridge, JSContextRef context)
- (void)setUp - (void)setUp
{ {
__weak RCTJSCExecutor *weakSelf = self; #if RCT_PROFILE
__weak RCTBridge *weakBridge = _bridge;
#ifndef __clang_analyzer__ #ifndef __clang_analyzer__
_bridge.flowIDMap = CFDictionaryCreateMutable(NULL, 0, NULL, NULL); _bridge.flowIDMap = CFDictionaryCreateMutable(NULL, 0, NULL, NULL);
#endif #endif
_bridge.flowIDMapLock = [NSLock new]; _bridge.flowIDMapLock = [NSLock new];
#if RCT_PROFILE
for (NSString *event in @[RCTProfileDidStartProfiling, RCTProfileDidEndProfiling]) { for (NSString *event in @[RCTProfileDidStartProfiling, RCTProfileDidEndProfiling]) {
[[NSNotificationCenter defaultCenter] addObserver:self [[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(toggleProfilingFlag:) selector:@selector(toggleProfilingFlag:)
@ -348,52 +345,54 @@ static void RCTInstallJSCProfiler(RCTBridge *bridge, JSContextRef context)
#endif #endif
[self executeBlockOnJavaScriptQueue:^{ [self executeBlockOnJavaScriptQueue:^{
RCTJSCExecutor *strongSelf = weakSelf; if (!self.valid) {
if (!strongSelf.valid) {
return; return;
} }
[strongSelf->_performanceLogger markStartForTag:RCTPLJSCWrapperOpenLibrary]; [self->_performanceLogger markStartForTag:RCTPLJSCWrapperOpenLibrary];
strongSelf->_jscWrapper = RCTJSCWrapperCreate(strongSelf->_useCustomJSCLibrary); self->_jscWrapper = RCTJSCWrapperCreate(self->_useCustomJSCLibrary);
[strongSelf->_performanceLogger markStopForTag:RCTPLJSCWrapperOpenLibrary]; [self->_performanceLogger markStopForTag:RCTPLJSCWrapperOpenLibrary];
JSContext *context = strongSelf.context.context; JSContext *context = self.context.context;
if (strongSelf->_jscWrapper->configureJSContextForIOS != NULL) { if (self->_jscWrapper->configureJSContextForIOS != NULL) {
NSString *cachesPath = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject]; NSString *cachesPath = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject];
RCTAssert(cachesPath != nil, @"cachesPath should not be nil"); RCTAssert(cachesPath != nil, @"cachesPath should not be nil");
if (cachesPath) { if (cachesPath) {
strongSelf->_jscWrapper->configureJSContextForIOS(context.JSGlobalContextRef, [cachesPath UTF8String]); self->_jscWrapper->configureJSContextForIOS(context.JSGlobalContextRef, [cachesPath UTF8String]);
} }
} }
[[self class] installSynchronousHooksOnContext:context]; [[self class] installSynchronousHooksOnContext:context];
__weak RCTJSCExecutor *weakSelf = self;
context[@"nativeRequireModuleConfig"] = ^NSString *(NSString *moduleName) { context[@"nativeRequireModuleConfig"] = ^NSString *(NSString *moduleName) {
RCTJSCExecutor *strongSelf2 = weakSelf; RCTJSCExecutor *strongSelf = weakSelf;
if (!strongSelf2.valid) { if (!strongSelf.valid) {
return nil; return nil;
} }
RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"nativeRequireModuleConfig", nil); RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"nativeRequireModuleConfig", nil);
NSArray *config = [strongSelf2->_bridge configForModuleName:moduleName]; NSArray *config = [strongSelf->_bridge configForModuleName:moduleName];
NSString *result = config ? RCTJSONStringify(config, NULL) : nil; NSString *result = config ? RCTJSONStringify(config, NULL) : nil;
RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"js_call,config", @{ @"moduleName": moduleName }); RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"js_call,config", @{ @"moduleName": moduleName });
return result; return result;
}; };
context[@"nativeFlushQueueImmediate"] = ^(NSArray<NSArray *> *calls){ context[@"nativeFlushQueueImmediate"] = ^(NSArray<NSArray *> *calls){
RCTJSCExecutor *strongSelf2 = weakSelf; RCTJSCExecutor *strongSelf = weakSelf;
if (!strongSelf2.valid || !calls) { if (!strongSelf.valid || !calls) {
return; return;
} }
RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"nativeFlushQueueImmediate", nil); RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"nativeFlushQueueImmediate", nil);
[strongSelf2->_bridge handleBuffer:calls batchEnded:NO]; [strongSelf->_bridge handleBuffer:calls batchEnded:NO];
RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"js_call", nil); RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"js_call", nil);
}; };
#if RCT_PROFILE #if RCT_PROFILE
__weak RCTBridge *weakBridge = self->_bridge;
context[@"nativeTraceBeginAsyncFlow"] = ^(__unused uint64_t tag, __unused NSString *name, int64_t cookie) { context[@"nativeTraceBeginAsyncFlow"] = ^(__unused uint64_t tag, __unused NSString *name, int64_t cookie) {
if (RCTProfileIsProfiling()) { if (RCTProfileIsProfiling()) {
[weakBridge.flowIDMapLock lock]; [weakBridge.flowIDMapLock lock];
@ -415,19 +414,19 @@ static void RCTInstallJSCProfiler(RCTBridge *bridge, JSContextRef context)
#endif #endif
#if RCT_DEV #if RCT_DEV
RCTInstallJSCProfiler(strongSelf->_bridge, context.JSGlobalContextRef); RCTInstallJSCProfiler(self->_bridge, context.JSGlobalContextRef);
// Inject handler used by HMR // Inject handler used by HMR
context[@"nativeInjectHMRUpdate"] = ^(NSString *sourceCode, NSString *sourceCodeURL) { context[@"nativeInjectHMRUpdate"] = ^(NSString *sourceCode, NSString *sourceCodeURL) {
RCTJSCExecutor *strongSelf2 = weakSelf; RCTJSCExecutor *strongSelf = weakSelf;
if (!strongSelf2.valid) { if (!strongSelf.valid) {
return; return;
} }
RCTJSCWrapper *jscWrapper = strongSelf2->_jscWrapper; RCTJSCWrapper *jscWrapper = strongSelf->_jscWrapper;
JSStringRef execJSString = jscWrapper->JSStringCreateWithUTF8CString(sourceCode.UTF8String); JSStringRef execJSString = jscWrapper->JSStringCreateWithUTF8CString(sourceCode.UTF8String);
JSStringRef jsURL = jscWrapper->JSStringCreateWithUTF8CString(sourceCodeURL.UTF8String); JSStringRef jsURL = jscWrapper->JSStringCreateWithUTF8CString(sourceCodeURL.UTF8String);
jscWrapper->JSEvaluateScript(strongSelf2->_context.context.JSGlobalContextRef, execJSString, NULL, jsURL, 0, NULL); jscWrapper->JSEvaluateScript(strongSelf->_context.context.JSGlobalContextRef, execJSString, NULL, jsURL, 0, NULL);
jscWrapper->JSStringRelease(jsURL); jscWrapper->JSStringRelease(jsURL);
jscWrapper->JSStringRelease(execJSString); jscWrapper->JSStringRelease(execJSString);
}; };
@ -782,29 +781,27 @@ static void executeRandomAccessModule(RCTJSCExecutor *executor, uint32_t moduleI
[_performanceLogger setValue:0 forTag:RCTPLRAMNativeRequiresCount]; [_performanceLogger setValue:0 forTag:RCTPLRAMNativeRequiresCount];
[_performanceLogger setValue:0 forTag:RCTPLRAMNativeRequiresSize]; [_performanceLogger setValue:0 forTag:RCTPLRAMNativeRequiresSize];
__weak RCTJSCExecutor *weakSelf = self;
[self executeBlockOnJavaScriptQueue:^{ [self executeBlockOnJavaScriptQueue:^{
if (!self.valid) {
return;
}
__weak RCTJSCExecutor *weakSelf = self;
self.context.context[@"nativeRequire"] = ^(NSNumber *moduleID) {
RCTJSCExecutor *strongSelf = weakSelf; RCTJSCExecutor *strongSelf = weakSelf;
if (!strongSelf.valid) { if (!strongSelf || !moduleID) {
return; return;
} }
JSContext *context = strongSelf.context.context; [strongSelf->_performanceLogger addValue:1 forTag:RCTPLRAMNativeRequiresCount];
context[@"nativeRequire"] = ^(NSNumber *moduleID) { [strongSelf->_performanceLogger appendStartForTag:RCTPLRAMNativeRequires];
RCTJSCExecutor *strongSelf2 = weakSelf;
if (!strongSelf2 || !moduleID) {
return;
}
[strongSelf2->_performanceLogger addValue:1 forTag:RCTPLRAMNativeRequiresCount];
[strongSelf2->_performanceLogger appendStartForTag:RCTPLRAMNativeRequires];
RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways,
[@"nativeRequire_" stringByAppendingFormat:@"%@", moduleID], nil); [@"nativeRequire_" stringByAppendingFormat:@"%@", moduleID], nil);
const uint32_t ID = [moduleID unsignedIntValue]; const uint32_t ID = [moduleID unsignedIntValue];
if (ID < strongSelf2->_randomAccessBundle.numTableEntries) { if (ID < strongSelf->_randomAccessBundle.numTableEntries) {
ModuleData *moduleData = &strongSelf2->_randomAccessBundle.table[ID]; ModuleData *moduleData = &strongSelf->_randomAccessBundle.table[ID];
const uint32_t size = NSSwapLittleIntToHost(moduleData->size); const uint32_t size = NSSwapLittleIntToHost(moduleData->size);
// sparse entry in the table -- module does not exist or is contained in the startup section // sparse entry in the table -- module does not exist or is contained in the startup section
@ -812,12 +809,12 @@ static void executeRandomAccessModule(RCTJSCExecutor *executor, uint32_t moduleI
return; return;
} }
[strongSelf2->_performanceLogger addValue:size forTag:RCTPLRAMNativeRequiresSize]; [strongSelf->_performanceLogger addValue:size forTag:RCTPLRAMNativeRequiresSize];
executeRandomAccessModule(strongSelf2, ID, NSSwapLittleIntToHost(moduleData->offset), size); executeRandomAccessModule(strongSelf, ID, NSSwapLittleIntToHost(moduleData->offset), size);
} }
RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"js_call", nil); RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"js_call", nil);
[strongSelf2->_performanceLogger appendStopForTag:RCTPLRAMNativeRequires]; [strongSelf->_performanceLogger appendStopForTag:RCTPLRAMNativeRequires];
}; };
}]; }];
} }