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

Fix racing conditions on the profiler 

Summary: @​public

The flow event methods weren't properly synchronized and neither was the module
unhooking.

Reviewed By: @jspahrsummers

Differential Revision: D2498719
This commit is contained in:
Tadeu Zagallo 2015-10-02 04:16:04 -07:00 committed by facebook-github-bot-4
parent b1c8e490e0
commit beab8d52d4
1 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
React/Base/RCTProfile.m
View File

@ -166,9 +166,27 @@ static SEL RCTProfileProxySelector(SEL selector)
return NSSelectorFromString([RCTProfilePrefix stringByAppendingString:selectorName]); return NSSelectorFromString([RCTProfilePrefix stringByAppendingString:selectorName]);
} }
static dispatch_group_t RCTProfileGetUnhookGroup(void);
static dispatch_group_t RCTProfileGetUnhookGroup(void)
{
static dispatch_group_t unhookGroup;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
unhookGroup = dispatch_group_create();
});
return unhookGroup;
}
static void RCTProfileForwardInvocation(NSObject *, SEL, NSInvocation *); static void RCTProfileForwardInvocation(NSObject *, SEL, NSInvocation *);
static void RCTProfileForwardInvocation(NSObject *self, __unused SEL cmd, NSInvocation *invocation) static void RCTProfileForwardInvocation(NSObject *self, __unused SEL cmd, NSInvocation *invocation)
{ {
/**
* This is still not thread safe, but should reduce reasonably the number of crashes
*/
dispatch_group_wait(RCTProfileGetUnhookGroup(), DISPATCH_TIME_FOREVER);
NSString *name = [NSString stringWithFormat:@"-[%@ %@]", NSStringFromClass([self class]), NSStringFromSelector(invocation.selector)]; NSString *name = [NSString stringWithFormat:@"-[%@ %@]", NSStringFromClass([self class]), NSStringFromSelector(invocation.selector)];
SEL newSel = RCTProfileProxySelector(invocation.selector); SEL newSel = RCTProfileProxySelector(invocation.selector);
@ -244,13 +262,17 @@ void RCTProfileHookModules(RCTBridge *bridge)
void RCTProfileUnhookModules(RCTBridge *bridge) void RCTProfileUnhookModules(RCTBridge *bridge)
{ {
dispatch_group_enter(RCTProfileGetUnhookGroup());
for (RCTModuleData *moduleData in [bridge valueForKey:@"moduleDataByID"]) { for (RCTModuleData *moduleData in [bridge valueForKey:@"moduleDataByID"]) {
Class proxyClass = object_getClass(moduleData.instance); Class proxyClass = object_getClass(moduleData.instance);
if (moduleData.moduleClass != proxyClass) { if (moduleData.moduleClass != proxyClass) {
object_setClass(moduleData.instance, moduleData.moduleClass); object_setClass(moduleData.instance, moduleData.moduleClass);
objc_disposeClassPair(proxyClass); objc_disposeClassPair(proxyClass);
} }
}; }
dispatch_group_leave(RCTProfileGetUnhookGroup());
} }
@ -465,12 +487,14 @@ NSNumber *_RCTProfileBeginFlowEvent(void)
return @0; return @0;
} }
RCTProfileAddEvent(RCTProfileTraceEvents, RCTProfileLock(
@"name": @"flow", RCTProfileAddEvent(RCTProfileTraceEvents,
@"id": @(++flowID), @"name": @"flow",
@"cat": @"flow", @"id": @(++flowID),
@"ph": @"s", @"cat": @"flow",
@"ts": RCTProfileTimestamp(CACurrentMediaTime()), @"ph": @"s",
@"ts": RCTProfileTimestamp(CACurrentMediaTime()),
);
); );
return @(flowID); return @(flowID);
@ -484,12 +508,14 @@ void _RCTProfileEndFlowEvent(NSNumber *flowID)
return; return;
} }
RCTProfileAddEvent(RCTProfileTraceEvents, RCTProfileLock(
@"name": @"flow", RCTProfileAddEvent(RCTProfileTraceEvents,
@"id": flowID, @"name": @"flow",
@"cat": @"flow", @"id": flowID,
@"ph": @"f", @"cat": @"flow",
@"ts": RCTProfileTimestamp(CACurrentMediaTime()), @"ph": @"f",
@"ts": RCTProfileTimestamp(CACurrentMediaTime()),
);
); );
} }