You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by kf...@apache.org on 2017/07/24 09:37:11 UTC
[04/24] incubator-weex git commit: + [ios] tracing method
+ [ios] tracing method
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3cd9b977
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3cd9b977
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3cd9b977
Branch: refs/heads/0.15-dev
Commit: 3cd9b977fc79b1837072018f6e2806997f500193
Parents: 814cbfe
Author: 齐山 <su...@163.com>
Authored: Mon Jul 3 17:24:55 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Mon Jul 3 17:24:55 2017 +0800
----------------------------------------------------------------------
ios/playground/WeexDemo/WXDemoViewController.m | 4 +-
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 11 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 14 +-
.../Sources/Manager/WXComponentManager.m | 4 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 13 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 3 +
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 6 +-
.../WeexSDK/Sources/Utility/WXTracingManager.h | 30 ++--
.../WeexSDK/Sources/Utility/WXTracingManager.m | 139 ++++++++++++++++---
.../Sources/View/WXComponent+ViewManagement.m | 1 -
10 files changed, 171 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cd9b977/ios/playground/WeexDemo/WXDemoViewController.m
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo/WXDemoViewController.m b/ios/playground/WeexDemo/WXDemoViewController.m
index fe3c4f6..824759e 100644
--- a/ios/playground/WeexDemo/WXDemoViewController.m
+++ b/ios/playground/WeexDemo/WXDemoViewController.m
@@ -146,7 +146,9 @@
_instance.renderFinish = ^(UIView *view) {
WXLogDebug(@"%@", @"Render Finish...");
- [WXTracingManager getTracingData:weakSelf.instance.instanceId];
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [WXTracingManager getTracingData:weakSelf.instance.instanceId];
+ });
[weakSelf updateInstanceState:WeexInstanceAppear];
};
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cd9b977/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
index ff4b941..244913b 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
@@ -150,6 +150,7 @@ _Pragma("clang diagnostic pop") \
}
[manager startComponentTasks];
[manager createRoot:bodyData];
+ [WXTracingManager tracingGloabalTask:@"createBody" instanceId:instanceId ph:WXTracingEnd];
});
return 0;
@@ -172,6 +173,7 @@ _Pragma("clang diagnostic pop") \
}
[manager startComponentTasks];
[manager removeComponent:ref];
+ [WXTracingManager tracingGloabalTask:@"removeElement" instanceId:instanceId ph:WXTracingEnd];
});
return 0;
@@ -194,6 +196,7 @@ _Pragma("clang diagnostic pop") \
}
[manager startComponentTasks];
[manager moveComponent:ref toSuper:parentRef atIndex:index];
+ [WXTracingManager tracingGloabalTask:@"moveElement" instanceId:instanceId ph:WXTracingEnd];
});
return 0;
@@ -216,6 +219,7 @@ _Pragma("clang diagnostic pop") \
}
[manager startComponentTasks];
[manager updateAttributes:attrsData forComponent:ref];
+ [WXTracingManager tracingGloabalTask:@"updateAttrs" instanceId:instanceId ph:WXTracingEnd];
});
return 0;
@@ -238,6 +242,7 @@ _Pragma("clang diagnostic pop") \
}
[manager startComponentTasks];
[manager updateStyles:stylesData forComponent:ref];
+ [WXTracingManager tracingGloabalTask:@"updateStyle" instanceId:instanceId ph:WXTracingEnd];
});
return 0;
@@ -260,6 +265,7 @@ _Pragma("clang diagnostic pop") \
}
[manager startComponentTasks];
[manager addEvent:event toComponent:ref];
+ [WXTracingManager tracingGloabalTask:@"addEvent" instanceId:instanceId ph:WXTracingEnd];
});
return 0;
@@ -282,6 +288,7 @@ _Pragma("clang diagnostic pop") \
}
[manager startComponentTasks];
[manager removeEvent:event fromComponent:ref];
+ [WXTracingManager tracingGloabalTask:@"removeEvent" instanceId:instanceId ph:WXTracingEnd];
});
return 0;
@@ -381,7 +388,7 @@ _Pragma("clang diagnostic pop") \
-(void)tracingComponentTask:(NSDictionary *)task instanceId:(NSString *)instanceId
{
WXTracing *tracing = [WXTracing new];
- tracing.instanceId = instanceId;
+ tracing.iid = instanceId;
tracing.ref = task[@"ref"];
tracing.name = task[@"method"];
tracing.ph = WXTracingBegin;
@@ -392,7 +399,7 @@ _Pragma("clang diagnostic pop") \
-(void)tracingModuleTask:(NSDictionary *)task instanceId:(NSString *)instanceId
{
WXTracing *tracing = [WXTracing new];
- tracing.instanceId = instanceId;
+ tracing.iid = instanceId;
tracing.name = task[@"module"];
tracing.ph = WXTracingBegin;
tracing.fName = task[@"method"];
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cd9b977/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
index d5da1cf..85b1098 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
@@ -224,7 +224,7 @@
NSDictionary *bodyData = [body toDictionary];
WXLogDebug(@"callCreateBody...%@, %@,", instanceIdString, bodyData);
-
+ [WXTracingManager tracingGloabalTask:@"createBody" instanceId:instanceIdString ph:WXTracingBegin];
return [JSValue valueWithInt32:(int32_t)callCreateBody(instanceIdString, bodyData) inContext:[JSContext currentContext]];
};
@@ -239,7 +239,7 @@
NSString *refString = [ref toString];
WXLogDebug(@"callRemoveElement...%@, %@,", instanceIdString, refString);
-
+ [WXTracingManager tracingGloabalTask:@"removeElement" instanceId:instanceIdString ph:WXTracingBegin];
return [JSValue valueWithInt32:(int32_t)callRemoveElement(instanceIdString, refString) inContext:[JSContext currentContext]];
};
@@ -256,7 +256,7 @@
NSInteger moveIndex = [[index toNumber] integerValue];
WXLogDebug(@"callAddElement...%@, %@,", instanceIdString, refString);
-
+ [WXTracingManager tracingGloabalTask:@"moveElement" instanceId:instanceIdString ph:WXTracingBegin];
return [JSValue valueWithInt32:(int32_t)callMoveElement(instanceIdString, refString,parentRefString,moveIndex) inContext:[JSContext currentContext]];
};
@@ -272,7 +272,7 @@
NSDictionary *attrsData = [attrs toDictionary];
WXLogDebug(@"callUpdateAttrs...%@, %@, %@", instanceIdString, refString,attrsData);
-
+ [WXTracingManager tracingGloabalTask:@"updateAttrs" instanceId:instanceIdString ph:WXTracingBegin];
return [JSValue valueWithInt32:(int32_t)callUpdateAttrs(instanceIdString, refString,attrsData) inContext:[JSContext currentContext]];
};
@@ -288,7 +288,7 @@
NSDictionary *stylessData = [styles toDictionary];
WXLogDebug(@"callUpdateStyle...%@, %@, %@", instanceIdString, refString,stylessData);
-
+ [WXTracingManager tracingGloabalTask:@"updateStyle" instanceId:instanceIdString ph:WXTracingBegin];
return [JSValue valueWithInt32:(int32_t)callUpdateStyle(instanceIdString, refString,stylessData) inContext:[JSContext currentContext]];
};
@@ -304,7 +304,7 @@
NSString *eventString = [event toString];
WXLogDebug(@"callAddEvent...%@, %@, %@", instanceIdString, refString,eventString);
-
+ [WXTracingManager tracingGloabalTask:@"addEvent" instanceId:instanceIdString ph:WXTracingBegin];
return [JSValue valueWithInt32:(int32_t)callAddEvent(instanceIdString, refString,eventString) inContext:[JSContext currentContext]];
};
@@ -320,7 +320,7 @@
NSString *eventString = [event toString];
WXLogDebug(@"callRemoveEvent...%@, %@, %@", instanceIdString, refString,eventString);
-
+ [WXTracingManager tracingGloabalTask:@"removeEvent" instanceId:instanceIdString ph:WXTracingBegin];
return [JSValue valueWithInt32:(int32_t)callRemoveEvent(instanceIdString, refString,eventString) inContext:[JSContext currentContext]];
};
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cd9b977/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
index 63f799c..d737721 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
@@ -254,9 +254,7 @@ static css_node_t * rootNodeGetChild(void *context, int i)
if(supercomponent && component && supercomponent->_lazyCreateView) {
component->_lazyCreateView = YES;
}
-
-// NSLog(@"jerry.s type %@",component.type);
-// NSLog(@"jerry.s super type %@",supercomponent.type);
+
[self _addUITask:^{
[supercomponent insertSubview:component atIndex:index];
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cd9b977/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
index 1eabeb7..f6b744d 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -135,7 +135,7 @@
{
if([WXTracingManager isTracing]){
WXTracing *tracing = [WXTracing new];
- tracing.instanceId = self.weexInstance.instanceId;
+ tracing.iid = self.weexInstance.instanceId;
tracing.ref = _ref;
tracing.name = _type;
tracing.ph = ph;
@@ -143,17 +143,6 @@
}
}
--(void)getTracing
-{
- if([WXTracingManager isTracing]){
- WXTracing *tracing = [WXTracing new];
- tracing.instanceId = self.weexInstance.instanceId;
- tracing.ref = _ref;
- tracing.name = _type;
- }
-}
-
-
- (void)dealloc
{
free_css_node(_cssNode);
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cd9b977/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index d401a66..c5f3a4d 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -42,6 +42,7 @@
#import "WXTextComponent.h"
#import "WXConvert.h"
#import "WXPrerenderManager.h"
+#import "WXTracingManager.h"
NSString *const bundleUrlOptionKey = @"bundleUrl";
@@ -146,6 +147,7 @@ typedef enum : NSUInteger {
WXResourceRequest *request = [WXResourceRequest requestWithURL:url resourceType:WXResourceTypeMainBundle referrer:@"" cachePolicy:NSURLRequestUseProtocolCachePolicy];
[self _renderWithRequest:request options:options data:data];
+ [WXTracingManager startTracing:self.instanceId ref:nil className:nil name:WXTracingDataHanding ph:WXTracingBegin fName:@"renderWithURL" parentId:nil];
}
- (void)renderView:(NSString *)source options:(NSDictionary *)options data:(id)data
@@ -156,6 +158,7 @@ typedef enum : NSUInteger {
_jsData = data;
[self _renderWithMainBundleString:source];
+ [WXTracingManager startTracing:self.instanceId ref:nil className:nil name:WXTracingDataHanding ph:WXTracingBegin fName:@"renderView" parentId:nil];
}
- (void)_renderWithMainBundleString:(NSString *)mainBundleString
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cd9b977/ios/sdk/WeexSDK/Sources/Module/WXDomModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXDomModule.m b/ios/sdk/WeexSDK/Sources/Module/WXDomModule.m
index a176028..e81cdb2 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXDomModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXDomModule.m
@@ -92,10 +92,10 @@ WX_EXPORT_METHOD(@selector(getComponentRect:callback:))
- (void)addElement:(NSString *)parentRef addElement:(NSDictionary *)element atIndex:(NSInteger)index
{
WXTracing *tracing = [WXTracing new];
- tracing.instanceId = self.weexInstance.instanceId;
+ tracing.iid = self.weexInstance.instanceId;
tracing.name = @"dom";
tracing.ph = WXTracingEnd;
- tracing.fName = @"addElement:addElement:atIndex";
+ tracing.fName = @"addElement";
[WXTracingManager startTracing:tracing];
[self performBlockOnComponentManager:^(WXComponentManager *manager) {
[manager addComponent:element toSupercomponent:parentRef atIndex:index appendingInTree:NO];
@@ -133,7 +133,7 @@ WX_EXPORT_METHOD(@selector(getComponentRect:callback:))
- (void)createFinish
{
WXTracing *tracing = [WXTracing new];
- tracing.instanceId = self.weexInstance.instanceId;
+ tracing.iid = self.weexInstance.instanceId;
tracing.name = @"dom";
tracing.ph = WXTracingEnd;
tracing.fName = @"createFinish";
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cd9b977/ios/sdk/WeexSDK/Sources/Utility/WXTracingManager.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXTracingManager.h b/ios/sdk/WeexSDK/Sources/Utility/WXTracingManager.h
index 40dec07..6760760 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXTracingManager.h
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXTracingManager.h
@@ -20,26 +20,39 @@
#import <Foundation/Foundation.h>
#import "WXSDKInstance.h"
+#define WXTracingDataHanding @"WXTracingDataHanding"
+#define WXTracingJSCall @"jsCall"
+
#define WXTracingBegin @"B"
#define WXTracingEnd @"E"
#define WXTracingDuration @"D"
+typedef enum : NSUInteger {
+ // global
+ WXTDataHanding = 0,
+ WXTRender
+} WXTracingTag;
+
@interface WXTracing:NSObject
-@property (nonatomic, copy) NSString *ref;
-@property (nonatomic, copy) NSString *className;
-@property (nonatomic, copy) NSString *name;
-@property (nonatomic, copy) NSString *ph;
-@property (nonatomic) NSTimeInterval ts;
+@property (nonatomic, copy) NSString *ref; // compnonet id
+@property (nonatomic, copy) NSString *className; // compnonet class name or module class name
+@property (nonatomic, copy) NSString *name; // register name
+@property (nonatomic, copy) NSString *ph; // phase
+@property (nonatomic) NSTimeInterval ts; // time
+@property (nonatomic) long long traceId;
@property (nonatomic) NSTimeInterval duration;
-@property (nonatomic, copy) NSString *fName;
-@property (nonatomic, copy) NSString *instanceId;
+@property (nonatomic, copy) NSString *fName; // functionName
+@property (nonatomic, copy) NSString *iid; // instance id
+@property (nonatomic, copy) NSString *parentId;// parent event id
@end
@interface WXTracingTask:NSObject
-@property (nonatomic, copy) NSString *instanceId;
+@property (nonatomic, copy) NSString *iid;
+@property (nonatomic) long long counter;
+@property (nonatomic) WXTracingTag tag;
@property (nonatomic, strong) NSMutableArray *tracings;
@end
@@ -48,6 +61,7 @@
+(void)switchTracing:(BOOL)isTracing;
+(BOOL)isTracing;
+(void)startTracing:(WXTracing*)tracing;
++(void)startTracing:(NSString *)iid ref:(NSString*)ref className:(NSString *)className name:(NSString *)name ph:(NSString *)ph fName:(NSString *)fName parentId:(NSString *)parentId;
+ (void)tracingGloabalTask:(NSString *)fName instanceId:(NSString *)instanceId ph:(NSString *)ph;
+(void)getTracingData:(NSString *)instanceId;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cd9b977/ios/sdk/WeexSDK/Sources/Utility/WXTracingManager.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXTracingManager.m b/ios/sdk/WeexSDK/Sources/Utility/WXTracingManager.m
index 11b4a4e..db51022 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXTracingManager.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXTracingManager.m
@@ -18,6 +18,8 @@
*/
#import "WXTracingManager.h"
+#import "WXComponentFactory.h"
+#import "WXModuleFactory.h"
@implementation WXTracing
@@ -75,32 +77,135 @@
if(![WXTracingManager sharedInstance].tracingTasks){
[WXTracingManager sharedInstance].tracingTasks = [NSMutableDictionary new];
}
- if(![[WXTracingManager sharedInstance].tracingTasks objectForKey:tracing.instanceId]){
+ if(![[WXTracingManager sharedInstance].tracingTasks objectForKey:tracing.iid]){
WXTracingTask *task = [WXTracingTask new];
- task.instanceId = tracing.instanceId;
- [[WXTracingManager sharedInstance].tracingTasks setObject:task forKey:tracing.instanceId];
+ task.iid = tracing.iid;
+ [[WXTracingManager sharedInstance].tracingTasks setObject:task forKey:tracing.iid];
}
- WXTracingTask *task = [[WXTracingManager sharedInstance].tracingTasks objectForKey:tracing.instanceId];
+ WXTracingTask *task = [[WXTracingManager sharedInstance].tracingTasks objectForKey:tracing.iid];
if(!task.tracings){
task.tracings = [NSMutableArray new];
}
NSTimeInterval time=[[NSDate date] timeIntervalSince1970]*1000;
tracing.ts = time;
- [self updateTracings:task tracing:tracing];
+ if(![WXTracingEnd isEqualToString:tracing.ph]){ // end is should not update
+ tracing.traceId = task.counter++;
+ }
+ if([WXTracingDataHanding isEqualToString:tracing.name] && [WXTracingBegin isEqualToString:tracing.ph]){
+ task.tag = WXTDataHanding;
+ }
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self updateTracings:task tracing:tracing];
+ });
}
}
++(void)startTracing:(NSString *)iid ref:(NSString*)ref className:(NSString *)className name:(NSString *)name ph:(NSString *)ph fName:(NSString *)fName parentId:(NSString *)parentId
+{
+ if([self isTracing]){
+ WXTracing *tracing = [WXTracing new];
+ if(ref.length>0){
+ tracing.ref = ref;
+ }
+ if(className.length>0){
+ tracing.className = className;
+ }
+ if(name.length>0){
+ tracing.name = name;
+ }
+ if(fName.length>0){
+ tracing.fName = fName;
+ }
+ if(ph.length>0){
+ tracing.ph = ph;
+ }
+ if(iid.length>0){
+ tracing.iid = iid;
+ }
+ if(parentId.length>0){
+ tracing.parentId = parentId;
+ }
+ [self startTracing:tracing];
+ }
+}
+
++(WXTracing *)copyTracing:(WXTracing *)tracing
+{
+ WXTracing *newTracing = [WXTracing new];
+ if(tracing.ref.length>0){
+ newTracing.ref = tracing.ref;
+ }
+ if(tracing.className.length>0){
+ newTracing.className = tracing.className;
+ }
+ if(tracing.name.length>0){
+ newTracing.name = tracing.name;
+ }
+ if(tracing.fName.length>0){
+ newTracing.fName = tracing.fName;
+ }
+ if(tracing.ph.length>0){
+ newTracing.ph = tracing.ph;
+ }
+ if(tracing.iid.length>0){
+ newTracing.iid = tracing.iid;
+ }
+ if(tracing.parentId.length>0){
+ newTracing.parentId = tracing.parentId;
+ }
+ if(tracing.traceId>0){
+ newTracing.traceId = tracing.traceId;
+ }
+ if(tracing.ts>0){
+ newTracing.ts = tracing.ts;
+ }
+ return newTracing;
+}
+
++(NSString *)getclassName:(WXTracing *)tracing
+{
+ NSString *className = @"";
+ if(tracing.ref.length>0 && tracing.name.length >0){
+ Class cls = [WXComponentFactory classWithComponentName:tracing.name];
+ className = NSStringFromClass(cls);
+ }else if(tracing.name.length > 0){
+ Class cls = [WXModuleFactory classWithModuleName:tracing.name];
+ if(cls){
+ className = NSStringFromClass(cls);
+ }
+ }
+ return className;
+
+}
+
+(void)updateTracings:(WXTracingTask *)task tracing:(WXTracing *)tracing
{
- if([WXTracingEnd isEqualToString:tracing.ph]){
+ tracing.className = [self getclassName:tracing];
+ if(task.tag == WXTDataHanding){
+ if([WXTracingJSCall isEqualToString:tracing.name]){
+ NSMutableArray *tracings = [task.tracings copy];
+ [tracings enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(WXTracing *bTracing, NSUInteger idx, BOOL *stop) {
+ if(([WXTracingDataHanding isEqualToString:bTracing.name] || [bTracing.ref isEqualToString:tracing.ref])&&[WXTracingBegin isEqualToString:bTracing.ph]){
+ WXTracing *newTracing = [self copyTracing:bTracing];
+ newTracing.iid = newTracing.iid;
+ newTracing.ph = WXTracingEnd;
+ newTracing.duration = [[NSDate date] timeIntervalSince1970]*1000 - bTracing.ts ;
+ [task.tracings addObject:newTracing];
+ *stop = YES;
+ }
+ }];
+ task.tag = WXTRender;
+ }
+ }
+ if([WXTracingEnd isEqualToString:tracing.ph]){ // deal end
NSMutableArray *tracings = [task.tracings copy];
- for (WXTracing *bTracing in tracings) {
+ [tracings enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(WXTracing *bTracing, NSUInteger idx, BOOL *stop) {
if(([bTracing.fName isEqualToString:tracing.fName] || [bTracing.ref isEqualToString:tracing.ref])&&[WXTracingBegin isEqualToString:bTracing.ph]){
- bTracing.ph = WXTracingDuration;
- bTracing.duration = [[NSDate date] timeIntervalSince1970]*1000 - bTracing.ts ;
- return;
+ tracing.iid = bTracing.iid;
+ tracing.duration = [[NSDate date] timeIntervalSince1970]*1000 - bTracing.ts ;
+ *stop = YES;
}
- }
+ }];
}
[task.tracings addObject:tracing];
}
@@ -108,20 +213,20 @@
+ (void)tracingGloabalTask:(NSString *)fName instanceId:(NSString *)instanceId ph:(NSString *)ph
{
WXTracing *tracing = [WXTracing new];
- tracing.instanceId = instanceId;
- tracing.name = @"global";
+ tracing.iid = instanceId;
+ tracing.name = @"jsCall";
tracing.ph = ph;
tracing.fName = fName;
- dispatch_async(dispatch_get_main_queue(), ^{
- [WXTracingManager startTracing:tracing];
- });
+ [WXTracingManager startTracing:tracing];
}
+(void)getTracingData:(NSString *)instanceId{
WXTracingTask *task = [[WXTracingManager sharedInstance].tracingTasks objectForKey:instanceId];
NSArray *tracings = [task.tracings copy];
for (WXTracing *tracing in tracings) {
- NSLog(@"%@ %@ %f",tracing.fName,tracing.name,tracing.duration);
+ if(![WXTracingBegin isEqualToString:tracing.ph]){
+ NSLog(@"%@ %@ %@ %f",tracing.fName,tracing.name,tracing.className,tracing.duration);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cd9b977/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
index bd16db2..f3468b0 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
@@ -139,7 +139,6 @@ do {\
- (void)viewDidLoad
{
[self tracing:WXTracingEnd];
- [self getTracing];
WXAssertMainThread();
}