kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-29 04:35:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix class pair register on reload

Browse Source 
Summary: public

It was possible after reload to detach from the new instance, removing the markers.

Reviewed By: jspahrsummers

Differential Revision: D2696208

fb-gh-sync-id: ad8f5d449f51c7c74a20ae7c0cafc4fc786ea390
This commit is contained in:
Tadeu Zagallo
2015-11-26 06:38:11 -08:00
committed by facebook-github-bot-3
parent 977a40ed04
commit a7e2059c15
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
React/Profiler/RCTProfile.m
View File

@@ -48,7 +48,6 @@ NSString *const RCTProfilePrefix = @"rct_profile_";
// This is actually a BOOL - but has to be compatible with OSAtomic // This is actually a BOOL - but has to be compatible with OSAtomic
static volatile uint32_t RCTProfileProfiling; static volatile uint32_t RCTProfileProfiling;
static BOOL RCTProfileHookedModules;
static NSDictionary *RCTProfileInfo; static NSDictionary *RCTProfileInfo;
static NSMutableDictionary *RCTProfileOngoingEvents; static NSMutableDictionary *RCTProfileOngoingEvents;
static NSTimeInterval RCTProfileStartTime; static NSTimeInterval RCTProfileStartTime;
@@ -210,19 +209,21 @@ void RCTProfileHookModules(RCTBridge *bridge)
{ {
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wtautological-pointer-compare" #pragma clang diagnostic ignored "-Wtautological-pointer-compare"
if (RCTProfileTrampoline == NULL || RCTProfileHookedModules) { if (RCTProfileTrampoline == NULL) {
return; return;
} }
#pragma clang diagnostic pop #pragma clang diagnostic pop
RCTProfileHookedModules = YES;
for (RCTModuleData *moduleData in [bridge valueForKey:@"moduleDataByID"]) { for (RCTModuleData *moduleData in [bridge valueForKey:@"moduleDataByID"]) {
[bridge dispatchBlock:^{ [bridge dispatchBlock:^{
Class moduleClass = moduleData.moduleClass; Class moduleClass = moduleData.moduleClass;
Class proxyClass = objc_allocateClassPair(moduleClass, RCTProfileProxyClassName(moduleClass), 0); Class proxyClass = objc_allocateClassPair(moduleClass, RCTProfileProxyClassName(moduleClass), 0);
if (!proxyClass) { if (!proxyClass) {
proxyClass = objc_getClass(RCTProfileProxyClassName(moduleClass));
if (proxyClass) {
object_setClass(moduleData.instance, proxyClass);
}
return; return;
} }
@@ -255,19 +256,12 @@ void RCTProfileHookModules(RCTBridge *bridge)
void RCTProfileUnhookModules(RCTBridge *bridge) void RCTProfileUnhookModules(RCTBridge *bridge)
{ {
if (!RCTProfileHookedModules) {
return;
}
RCTProfileHookedModules = NO;
dispatch_group_enter(RCTProfileGetUnhookGroup()); 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);
} }
} }