status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-10 08:26:23 +00:00
Code Issues Projects Releases Wiki Activity

Revert "[ReactNative] Fix crash when reload during profile"

Browse Source
This commit is contained in:
Natansh Verma 2015-07-08 00:20:05 -07:00
parent 0ffb2d36eb
commit f21e79d5e1
4 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
React/Base/RCTBatchedBridge.m
View File

@ -106,13 +106,6 @@ id<RCTJavaScriptExecutor> RCTGetLatestExecutor(void)
*/ */
[self registerModules]; [self registerModules];
/**
* If currently profiling, hook into the current instance
*/
if (RCTProfileIsProfiling()) {
RCTProfileHookModules(self);
}
/** /**
* Start the application script * Start the application script
*/ */
@ -371,13 +364,8 @@ RCT_NOT_IMPLEMENTED(-initWithBundleURL:(__unused NSURL *)bundleURL
} }
moduleData.queue = nil; moduleData.queue = nil;
} }
dispatch_group_notify(group, dispatch_get_main_queue(), ^{ dispatch_group_notify(group, dispatch_get_main_queue(), ^{
[_javaScriptExecutor executeBlockOnJavaScriptQueue:^{ [_javaScriptExecutor executeBlockOnJavaScriptQueue:^{
if (RCTProfileIsProfiling()) {
RCTProfileUnhookModules(self);
}
[_jsDisplayLink invalidate]; [_jsDisplayLink invalidate];
_jsDisplayLink = nil; _jsDisplayLink = nil;

13
React/Base/RCTProfile.h
View File

@ -103,16 +103,6 @@ RCT_EXTERN void RCTProfileImmediateEvent(NSString *, NSTimeInterval , NSString *
RCTProfileEndEvent([NSString stringWithFormat:@"[%@ %@]", NSStringFromClass([self class]), NSStringFromSelector(_cmd)], category, arguments); \ RCTProfileEndEvent([NSString stringWithFormat:@"[%@ %@]", NSStringFromClass([self class]), NSStringFromSelector(_cmd)], category, arguments); \
} }
/**
* Hook into a bridge instance to log all bridge module's method calls
*/
RCT_EXTERN void RCTProfileHookModules(RCTBridge *);
/**
* Unhook from a given bridge instance's modules
*/
RCT_EXTERN void RCTProfileUnhookModules(RCTBridge *);
#else #else
#define RCTProfileBeginFlowEvent() #define RCTProfileBeginFlowEvent()
@ -135,7 +125,4 @@ RCT_EXTERN void RCTProfileUnhookModules(RCTBridge *);
#define RCTProfileBlock(block, ...) block #define RCTProfileBlock(block, ...) block
#define RCTProfileHookModules(...)
#define RCTProfileUnhookModules(...)
#endif #endif

8
React/Base/RCTProfile.m
View File

@ -144,17 +144,14 @@ static IMP RCTProfileMsgForward(NSObject *self, SEL selector)
return imp; return imp;
} }
void RCTProfileHookModules(RCTBridge *bridge) static void RCTProfileHookModules(RCTBridge *);
static void RCTProfileHookModules(RCTBridge *bridge)
{ {
for (RCTModuleData *moduleData in [bridge valueForKey:@"_modules"]) { for (RCTModuleData *moduleData in [bridge valueForKey:@"_modules"]) {
[moduleData dispatchBlock:^{ [moduleData dispatchBlock:^{
Class moduleClass = moduleData.cls; Class moduleClass = moduleData.cls;
Class proxyClass = objc_allocateClassPair(moduleClass, RCTProfileProxyClassName(moduleClass), 0); Class proxyClass = objc_allocateClassPair(moduleClass, RCTProfileProxyClassName(moduleClass), 0);
if (!proxyClass) {
return;
}
unsigned int methodCount; unsigned int methodCount;
Method *methods = class_copyMethodList(moduleClass, &methodCount); Method *methods = class_copyMethodList(moduleClass, &methodCount);
for (NSUInteger i = 0; i < methodCount; i++) { for (NSUInteger i = 0; i < methodCount; i++) {
@ -188,6 +185,7 @@ void RCTProfileHookModules(RCTBridge *bridge)
} }
} }
void RCTProfileUnhookModules(RCTBridge *);
void RCTProfileUnhookModules(RCTBridge *bridge) void RCTProfileUnhookModules(RCTBridge *bridge)
{ {
for (RCTModuleData *moduleData in [bridge valueForKey:@"_modules"]) { for (RCTModuleData *moduleData in [bridge valueForKey:@"_modules"]) {

2
React/Views/RCTNavigator.m
View File

@ -436,7 +436,7 @@ RCT_NOT_IMPLEMENTED(-initWithCoder:(NSCoder *)aDecoder)
*/ */
- (UIView *)reactSuperview - (UIView *)reactSuperview
{ {
RCTAssert(!_bridge.isValid || self.superview != nil, @"put reactNavSuperviewLink back"); RCTAssert(self.superview != nil, @"put reactNavSuperviewLink back");
return self.superview ? self.superview : self.reactNavSuperviewLink; return self.superview ? self.superview : self.reactNavSuperviewLink;
} }