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

Improve fbsystrace support 

Reviewed By: mhorowitz

Differential Revision: D4756318

fbshipit-source-id: 7811f680a7ad044b5ae028ee9b2fed5f46ce2a63
This commit is contained in:
Pieter De Baets 2017-03-30 06:36:21 -07:00 committed by Facebook Github Bot
parent 12de9729bd
commit 5af30382d5
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
React/Base/RCTBridge.m
View File

@ -301,15 +301,6 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
} }
RCTAssert(implClass != nil, @"No bridge implementation is available, giving up."); RCTAssert(implClass != nil, @"No bridge implementation is available, giving up.");
#ifdef WITH_FBSYSTRACE
if (implClass == cxxBridgeClass) {
[RCTFBSystrace registerCallbacks];
} else {
[RCTFBSystrace unregisterCallbacks];
}
#endif
return implClass; return implClass;
} }

6
React/CxxBridge/RCTCxxBridge.mm
View File

@ -1139,6 +1139,9 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithBundleURL:(__unused NSURL *)bundleUR
RCTAssertMainQueue(); RCTAssertMainQueue();
[self executeBlockOnJavaScriptThread:^{ [self executeBlockOnJavaScriptThread:^{
#if WITH_FBSYSTRACE
[RCTFBSystrace registerCallbacks];
#endif
RCTProfileInit(self); RCTProfileInit(self);
}]; }];
} }
@ -1151,6 +1154,9 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithBundleURL:(__unused NSURL *)bundleUR
RCTProfileEnd(self, ^(NSString *log) { RCTProfileEnd(self, ^(NSString *log) {
NSData *logData = [log dataUsingEncoding:NSUTF8StringEncoding]; NSData *logData = [log dataUsingEncoding:NSUTF8StringEncoding];
callback(logData); callback(logData);
#if WITH_FBSYSTRACE
[RCTFBSystrace unregisterCallbacks];
#endif
}); });
}]; }];
} }

2
React/Profiler/RCTProfile.h
View File

@ -175,7 +175,7 @@ typedef struct {
} systrace_arg_t; } systrace_arg_t;
typedef struct { typedef struct {
void (*start)(uint64_t enabledTags, char *buffer, size_t bufferSize); char *(*start)(void);
void (*stop)(void); void (*stop)(void);
void (*begin_section)(uint64_t tag, const char *name, size_t numArgs, systrace_arg_t *args); void (*begin_section)(uint64_t tag, const char *name, size_t numArgs, systrace_arg_t *args);

11
React/Profiler/RCTProfile.m
View File

@ -455,9 +455,7 @@ void RCTProfileInit(RCTBridge *bridge)
OSAtomicOr32Barrier(1, &RCTProfileProfiling); OSAtomicOr32Barrier(1, &RCTProfileProfiling);
if (callbacks != NULL) { if (callbacks != NULL) {
size_t buffer_size = 1 << 22; systrace_buffer = callbacks->start();
systrace_buffer = calloc(1, buffer_size);
callbacks->start(~((uint64_t)0), systrace_buffer, buffer_size);
} else { } else {
NSTimeInterval time = CACurrentMediaTime(); NSTimeInterval time = CACurrentMediaTime();
dispatch_async(RCTProfileGetQueue(), ^{ dispatch_async(RCTProfileGetQueue(), ^{
@ -514,9 +512,10 @@ void RCTProfileEnd(RCTBridge *bridge, void (^callback)(NSString *))
RCTProfileUnhookModules(bridge); RCTProfileUnhookModules(bridge);
if (callbacks != NULL) { if (callbacks != NULL) {
callbacks->stop(); if (systrace_buffer) {
callbacks->stop();
callback(@(systrace_buffer)); callback(@(systrace_buffer));
}
} else { } else {
dispatch_async(RCTProfileGetQueue(), ^{ dispatch_async(RCTProfileGetQueue(), ^{
NSString *log = RCTJSONStringify(RCTProfileInfo, NULL); NSString *log = RCTJSONStringify(RCTProfileInfo, NULL);