zshshr closed pull request #1990: [iOS] Remove old tracing system.
URL: https://github.com/apache/incubator-weex/pull/1990
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 23841ed0e4..d7c4e24a45 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -745,8 +745,6 @@
C401945E1E344E8300D19C31 /* WXFloatCompareTests.m in Sources */
= {isa = PBXBuildFile; fileRef = C401945D1E344E8300D19C31 /*
WXFloatCompareTests.m */; };
C41E1A971DC1FD15009C7F90 /* WXDatePickerManager.h in Headers */
= {isa = PBXBuildFile; fileRef = C41E1A951DC1FD15009C7F90 /*
WXDatePickerManager.h */; };
C41E1A981DC1FD15009C7F90 /* WXDatePickerManager.m in Sources */
= {isa = PBXBuildFile; fileRef = C41E1A961DC1FD15009C7F90 /*
WXDatePickerManager.m */; };
- C42E8F9B1F39DF07001EBE9D /* WXTracingProtocol.h in Headers */ =
{isa = PBXBuildFile; fileRef = C42E8F991F39DF07001EBE9D /* WXTracingProtocol.h
*/; settings = {ATTRIBUTES = (Public, ); }; };
- C42E8FAA1F3C7AA1001EBE9D /* WXTracingProtocol.h in Headers */ =
{isa = PBXBuildFile; fileRef = C42E8F991F39DF07001EBE9D /* WXTracingProtocol.h
*/; settings = {ATTRIBUTES = (Public, ); }; };
C42E8FAB1F3C7C09001EBE9D /* WXExtendCallNativeProtocol.h in
Headers */ = {isa = PBXBuildFile; fileRef = C4424E591F24DA3D009F52E2 /*
WXExtendCallNativeProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
C42E8FAC1F3C7C3B001EBE9D /* WXExtendCallNativeManager.m in
Sources */ = {isa = PBXBuildFile; fileRef = C47B78CD1F2998EE001D3B0C /*
WXExtendCallNativeManager.m */; };
C42E8FAD1F3C7C3F001EBE9D /* WXExtendCallNativeManager.h in
Headers */ = {isa = PBXBuildFile; fileRef = C47B78CC1F2998EE001D3B0C /*
WXExtendCallNativeManager.h */; };
@@ -768,8 +766,6 @@
C4D872261E5DDF7500E39BC1 /* WXBoxShadow.m in Sources */ = {isa
= PBXBuildFile; fileRef = C4D872241E5DDF7500E39BC1 /* WXBoxShadow.m */; };
C4E375371E5FCBD3009B2D9C /* WXComponent+BoxShadow.m in Sources
*/ = {isa = PBXBuildFile; fileRef = C4E375351E5FCBD3009B2D9C /*
WXComponent+BoxShadow.m */; };
C4E375381E5FCBD3009B2D9C /* WXComponent+BoxShadow.h in Headers
*/ = {isa = PBXBuildFile; fileRef = C4E375361E5FCBD3009B2D9C /*
WXComponent+BoxShadow.h */; };
- C4E97D331F1EF46D00ABC314 /* WXTracingManager.h in Headers */ =
{isa = PBXBuildFile; fileRef = C4E97D311F1EF46D00ABC314 /* WXTracingManager.h
*/; settings = {ATTRIBUTES = (Public, ); }; };
- C4E97D341F1EF46D00ABC314 /* WXTracingManager.m in Sources */ =
{isa = PBXBuildFile; fileRef = C4E97D321F1EF46D00ABC314 /* WXTracingManager.m
*/; };
C4F0127D1E1502A6003378D0 /* WXWebSocketHandler.h in Headers */
= {isa = PBXBuildFile; fileRef = C4F012761E1502A6003378D0 /*
WXWebSocketHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
C4F012821E1502E9003378D0 /* WXWebSocketModule.h in Headers */ =
{isa = PBXBuildFile; fileRef = C4F012801E1502E9003378D0 /* WXWebSocketModule.h
*/; };
C4F012831E1502E9003378D0 /* WXWebSocketModule.m in Sources */ =
{isa = PBXBuildFile; fileRef = C4F012811E1502E9003378D0 /* WXWebSocketModule.m
*/; };
@@ -1047,8 +1043,6 @@
DCE2CF9D1F46D4370021BDC4 /* WXVoiceOverModule.m in Sources */ =
{isa = PBXBuildFile; fileRef = DCE2CF981F46D4220021BDC4 /* WXVoiceOverModule.m
*/; };
DCE7F1EF20AD358A00D471E7 /* WXPageEventNotifyEvent.h in Headers
*/ = {isa = PBXBuildFile; fileRef = DCE7F1EE20AD358A00D471E7 /*
WXPageEventNotifyEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
DCE7F1F020AD358A00D471E7 /* WXPageEventNotifyEvent.h in Headers
*/ = {isa = PBXBuildFile; fileRef = DCE7F1EE20AD358A00D471E7 /*
WXPageEventNotifyEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
- DCEA54621F2B7DB4000ECB23 /* WXTracingManager.h in Headers */ =
{isa = PBXBuildFile; fileRef = C4E97D311F1EF46D00ABC314 /* WXTracingManager.h
*/; settings = {ATTRIBUTES = (Public, ); }; };
- DCEA54631F2B7DBA000ECB23 /* WXTracingManager.m in Sources */ =
{isa = PBXBuildFile; fileRef = C4E97D321F1EF46D00ABC314 /* WXTracingManager.m
*/; };
DCF087611DCAE161005CD6EB /* WXInvocationConfig.h in Headers */
= {isa = PBXBuildFile; fileRef = DCF0875F1DCAE161005CD6EB /*
WXInvocationConfig.h */; };
DCF087621DCAE161005CD6EB /* WXInvocationConfig.m in Sources */
= {isa = PBXBuildFile; fileRef = DCF087601DCAE161005CD6EB /*
WXInvocationConfig.m */; };
DCF343671E49CAEE00A2FB34 /* WXJSExceptionInfo.h in Headers */ =
{isa = PBXBuildFile; fileRef = DCF343651E49CAEE00A2FB34 /* WXJSExceptionInfo.h
*/; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1566,7 +1560,6 @@
C401945D1E344E8300D19C31 /* WXFloatCompareTests.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXFloatCompareTests.m; sourceTree = "<group>"; };
C41E1A951DC1FD15009C7F90 /* WXDatePickerManager.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXDatePickerManager.h; sourceTree = "<group>"; };
C41E1A961DC1FD15009C7F90 /* WXDatePickerManager.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXDatePickerManager.m; sourceTree = "<group>"; };
- C42E8F991F39DF07001EBE9D /* WXTracingProtocol.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXTracingProtocol.h; sourceTree = "<group>"; };
C43C03E41EC8ACA40044C7FF /* WXPrerenderManager.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXPrerenderManager.h; sourceTree = "<group>"; };
C43C03E51EC8ACA40044C7FF /* WXPrerenderManager.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXPrerenderManager.m; sourceTree = "<group>"; };
C4424E591F24DA3D009F52E2 /* WXExtendCallNativeProtocol.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = WXExtendCallNativeProtocol.h; sourceTree = "<group>"; };
@@ -1584,8 +1577,6 @@
C4D872241E5DDF7500E39BC1 /* WXBoxShadow.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXBoxShadow.m; sourceTree = "<group>"; };
C4E375351E5FCBD3009B2D9C /* WXComponent+BoxShadow.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= "WXComponent+BoxShadow.m"; sourceTree = "<group>"; };
C4E375361E5FCBD3009B2D9C /* WXComponent+BoxShadow.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"WXComponent+BoxShadow.h"; sourceTree = "<group>"; };
- C4E97D311F1EF46D00ABC314 /* WXTracingManager.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXTracingManager.h; sourceTree = "<group>"; };
- C4E97D321F1EF46D00ABC314 /* WXTracingManager.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXTracingManager.m; sourceTree = "<group>"; };
C4F012761E1502A6003378D0 /* WXWebSocketHandler.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXWebSocketHandler.h; sourceTree = "<group>"; };
C4F012801E1502E9003378D0 /* WXWebSocketModule.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXWebSocketModule.h; sourceTree = "<group>"; };
C4F012811E1502E9003378D0 /* WXWebSocketModule.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXWebSocketModule.m; sourceTree = "<group>"; };
@@ -2049,8 +2040,6 @@
77D1611A1C02DD3C0010B15B /* Manager */ = {
isa = PBXGroup;
children = (
- C4E97D311F1EF46D00ABC314 /* WXTracingManager.h
*/,
- C4E97D321F1EF46D00ABC314 /* WXTracingManager.m
*/,
740451E81E14BB26004157CB /* WXServiceFactory.h
*/,
45326708213FC84900DAA620 /*
WXDisplayLinkManager.h */,
45326709213FC84900DAA620 /*
WXDisplayLinkManager.m */,
@@ -2116,7 +2105,6 @@
042013AC1E66CD6A001FC79C /*
WXValidateProtocol.h */,
DC6836E51EBB12B200AD2D84 /*
WXConfigCenterProtocol.h */,
C4424E591F24DA3D009F52E2 /*
WXExtendCallNativeProtocol.h */,
- C42E8F991F39DF07001EBE9D /* WXTracingProtocol.h
*/,
);
path = Protocol;
sourceTree = "<group>";
@@ -2836,7 +2824,6 @@
17C74F0B2072145100AB4CAB /*
WXAnalyzerCenter+Transfer.h in Headers */,
D362F94F1C83EDA20003F546 /* WXWebViewModule.h
in Headers */,
C4F012861E150307003378D0 /* WXWebSocketLoader.h
in Headers */,
- C4E97D331F1EF46D00ABC314 /* WXTracingManager.h
in Headers */,
77D161381C02DE940010B15B /* WXBridgeManager.h
in Headers */,
B8F2C70A2133A83C00635B37 /*
rax_parser_statistics.h in Headers */,
C4D872251E5DDF7500E39BC1 /* WXBoxShadow.h in
Headers */,
@@ -2868,7 +2855,6 @@
DCA446271EFA5DAF00D0CFA8 /* WeexSDK.h in
Headers */,
841CD1051F974DFA0081196D /* WXExceptionUtils.h
in Headers */,
745B2D6A1E5A8E1E0092D38A /*
WXRecyclerComponent.h in Headers */,
- C42E8F9B1F39DF07001EBE9D /* WXTracingProtocol.h
in Headers */,
453F3763219A770900A03F1D /*
vnode_on_event_listener.h in Headers */,
B8D66C6D21255730003960BD /* render_text.h in
Headers */,
7423899F1C32733800D748CA /* WXType.h in Headers
*/,
@@ -3291,7 +3277,6 @@
DCA446001EFA5A4800D0CFA8 /* WXDomModule.h in
Headers */,
DCA446021EFA5A5000D0CFA8 /* WXWebViewModule.h
in Headers */,
B8D66BF22125572F003960BD /* ast_visitor.h in
Headers */,
- C42E8FAA1F3C7AA1001EBE9D /* WXTracingProtocol.h
in Headers */,
DCA446181EFA5A9B00D0CFA8 /* JSValue+Weex.h in
Headers */,
DCA446061EFA5A5B00D0CFA8 /* NSTimer+Weex.h in
Headers */,
DCA445D61EFA598600D0CFA8 /* WXView.h in Headers
*/,
@@ -3337,7 +3322,6 @@
DCA445D91EFA59A100D0CFA8 /* WXEditComponent.h
in Headers */,
DCA445FB1EFA5A3C00D0CFA8 /* WXStorageModule.h
in Headers */,
DCA446051EFA5A5800D0CFA8 /* WXBoxShadow.h in
Headers */,
- DCEA54621F2B7DB4000ECB23 /* WXTracingManager.h
in Headers */,
DCA445D11EFA594200D0CFA8 /* WXLayer.h in
Headers */,
DCA4460A1EFA5A6F00D0CFA8 /*
WXSimulatorShortcutManager.h in Headers */,
DCA445E11EFA59D100D0CFA8 /*
WXSliderNeighborComponent.h in Headers */,
@@ -3794,7 +3778,6 @@
841CD1031F9739890081196D /* WXExceptionUtils.m
in Sources */,
B8D66CD921255730003960BD /*
message_pump_posix.cc in Sources */,
453F375E219A76FA00A03F1D /*
vcomponent_lifecycle_listener.mm in Sources */,
- C4E97D341F1EF46D00ABC314 /* WXTracingManager.m
in Sources */,
742AD72F1DF98C45007DC46C /* WXResourceRequest.m
in Sources */,
7461F8931CFB373100F62D44 /* WXLayer.m in
Sources */,
74D205211E091B8000128F44 /* WXCallJSMethod.m in
Sources */,
@@ -3998,7 +3981,6 @@
B8D66C7221255730003960BD /* render_appbar.cpp
in Sources */,
B8D66CAE21255730003960BD /* wson_parser.cpp in
Sources */,
DCA445821EFA55B300D0CFA8 /* WXSDKEngine.m in
Sources */,
- DCEA54631F2B7DBA000ECB23 /* WXTracingManager.m
in Sources */,
DCA445831EFA55B300D0CFA8 /* WXBridgeMethod.m in
Sources */,
DCA445841EFA55B300D0CFA8 /* WXModuleMethod.m in
Sources */,
B8D66CA821255730003960BD /* wson.c in Sources
*/,
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
index 4b4b5452ed..6f55eb43f5 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
@@ -37,7 +37,6 @@
#import "WXCallJSMethod.h"
#import "WXSDKInstance_private.h"
#import "WXPrerenderManager.h"
-#import "WXTracingManager.h"
#import "WXExceptionUtils.h"
#import "WXSDKEngine.h"
#import "WXPolyfillSet.h"
@@ -137,7 +136,6 @@ - (void)registerGlobalFunctions
[_jsBridge registerCallUpdateComponentData:^NSInteger(NSString
*instanceId, NSString *componentId, NSString *jsonData) {
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId
ref:componentId className:nil name:WXTDomCall phase:WXTracingBegin
functionName:@"__updateComponentData" options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callUpdateComponentData:instanceId
componentId:componentId jsonData:jsonData];
});
return 0;
@@ -146,7 +144,6 @@ - (void)registerGlobalFunctions
[_jsBridge registerCallAddElement:^NSInteger(NSString *instanceId,
NSString *parentRef, NSDictionary *elementData, NSInteger index) {
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId
ref:elementData[@"ref"] className:nil name:WXTDomCall phase:WXTracingBegin
functionName:@"addElement" options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callAddElement:instanceId parentRef:parentRef
data:elementData index:(int)index];
});
@@ -156,7 +153,6 @@ - (void)registerGlobalFunctions
[_jsBridge registerCallCreateBody:^NSInteger(NSString *instanceId,
NSDictionary *bodyData) {
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId
ref:bodyData[@"ref"] className:nil name:WXTDomCall phase:WXTracingBegin
functionName:@"createBody" options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callCreateBody:instanceId data:bodyData];
});
@@ -166,7 +162,6 @@ - (void)registerGlobalFunctions
[_jsBridge registerCallRemoveElement:^NSInteger(NSString *instanceId,
NSString *ref) {
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin
functionName:@"removeElement" options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callRemoveElement:instanceId ref:ref];
});
@@ -176,7 +171,6 @@ - (void)registerGlobalFunctions
[_jsBridge registerCallMoveElement:^NSInteger(NSString *instanceId,
NSString *ref, NSString *parentRef, NSInteger index) {
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"moveElement"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callMoveElement:instanceId ref:ref
parentRef:parentRef index:(int)index];
});
@@ -186,7 +180,6 @@ - (void)registerGlobalFunctions
[_jsBridge registerCallUpdateAttrs:^NSInteger(NSString *instanceId,
NSString *ref, NSDictionary *attrsData) {
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"updateAttrs"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callUpdateAttrs:instanceId ref:ref data:attrsData];
});
@@ -196,7 +189,6 @@ - (void)registerGlobalFunctions
[_jsBridge registerCallUpdateStyle:^NSInteger(NSString *instanceId,
NSString *ref, NSDictionary *stylesData) {
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"updateStyle"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callUpdateStyle:instanceId ref:ref data:stylesData];
});
@@ -206,7 +198,6 @@ - (void)registerGlobalFunctions
[_jsBridge registerCallAddEvent:^NSInteger(NSString *instanceId, NSString
*ref, NSString *event) {
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"addEvent"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callAddEvent:instanceId ref:ref event:event];
});
@@ -216,7 +207,6 @@ - (void)registerGlobalFunctions
[_jsBridge registerCallRemoveEvent:^NSInteger(NSString *instanceId,
NSString *ref, NSString *event) {
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"removeEvent"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callRemoveEvent:instanceId ref:ref event:event];
});
@@ -229,7 +219,6 @@ - (void)registerGlobalFunctions
[instance.apmInstance onStage:KEY_PAGE_STAGES_CREATE_FINISH];
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:nil
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"createFinish"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callCreateFinish:instanceId];
});
@@ -240,7 +229,6 @@ - (void)registerGlobalFunctions
[_jsBridge registerCallRefreshFinish:^NSInteger(NSString *instanceId) {
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId
ref:nil className:nil name:WXTDomCall phase:WXTracingBegin
functionName:@"refreshFinish" options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callRefreshFinish:instanceId];
});
@@ -252,7 +240,6 @@ - (void)registerGlobalFunctions
[_jsBridge registerCallUpdateFinish:^NSInteger(NSString *instanceId) {
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId
ref:nil className:nil name:WXTDomCall phase:WXTracingBegin
functionName:@"updateFinish" options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callUpdateFinish:instanceId];
});
@@ -367,12 +354,10 @@ - (NSInteger)invokeNative:(NSString *)instanceId
tasks:(NSArray *)tasks callback
NSString *ref = task[@"ref"];
WXComponentMethod *method = [[WXComponentMethod alloc]
initWithComponentRef:ref methodName:methodName arguments:arguments
instance:instance];
[method invoke];
- [WXTracingManager startTracingWithInstanceId:instanceId
ref:task[@"ref"] className:nil name:task[@"component"] phase:WXTracingBegin
functionName:task[@"method"] options:nil];
} else {
NSString *moduleName = task[@"module"];
NSDictionary *options = task[@"options"];
WXModuleMethod *method = [[WXModuleMethod alloc]
initWithModuleName:moduleName methodName:methodName arguments:arguments
options:options instance:instance];
- [WXTracingManager startTracingWithInstanceId:instanceId ref:nil
className:nil name:task[@"module"] phase:WXTracingBegin
functionName:task[@"method"] options:@{@"threadName":WXTJSBridgeThread}];
[method invoke];
}
}
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
index 37b5e9b05f..c67f1bc98d 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
@@ -23,7 +23,6 @@
#import "WXComponentManager.h"
#import "WXSDKInstance_private.h"
#import "WXLog.h"
-#import "WXTracingManager.h"
#import "WXBridgeProtocol.h"
#import "WXUtility.h"
#import "WXAssert.h"
@@ -242,8 +241,7 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
}
[manager startComponentTasks];
[manager updateFinish];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:nil
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"updateFinish"
options:@{@"threadName":WXTDOMThread}];
-
+
return 0;
}
@@ -261,7 +259,6 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
}
[manager startComponentTasks];
[manager refreshFinish];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:nil
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"refreshFinish"
options:@{@"threadName":WXTDOMThread}];
return 0;
}
@@ -289,7 +286,6 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
}
[manager startComponentTasks];
[manager addEvent:ns_event toComponent:ns_ref];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:ns_ref
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"addEvent"
options:@{@"threadName":WXTDOMThread}];
page->CallBridgeTime(getCurrentTime() - startTime);
return 0;
@@ -318,7 +314,6 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
}
[manager startComponentTasks];
[manager removeEvent:ns_event fromComponent:ns_ref];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:ns_ref
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"removeEvent"
options:@{@"threadName":WXTDOMThread}];
page->CallBridgeTime(getCurrentTime() - startTime);
return 0;
@@ -361,7 +356,6 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
}
[manager startComponentTasks];
[manager createBody:ns_ref type:ns_type styles:ns_styles
attributes:ns_attributes events:ns_events renderObject:renderObject];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:ns_ref
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"createBody"
options:@{@"threadName":WXTDOMThread}];
page->CallBridgeTime(getCurrentTime() - startTime);
return 0;
@@ -409,7 +403,6 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
[manager startComponentTasks];
[manager addComponent:ns_ref type:ns_componentType
parentRef:ns_parentRef styles:ns_styles attributes:ns_attributes
events:ns_events index:ns_index renderObject:renderObject];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:ns_ref
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"addElement"
options:@{@"threadName":WXTDOMThread}];
page->CallBridgeTime(getCurrentTime() - startTime);
return 0;
@@ -504,7 +497,6 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
[manager startComponentTasks];
[manager updateStyles:ns_style forComponent:ns_ref];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:ns_ref
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"updateStyles"
options:@{@"threadName":WXTDOMThread}];
page->CallBridgeTime(getCurrentTime() - startTime);
return 0;
@@ -541,7 +533,6 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
}
[manager startComponentTasks];
[manager updateAttributes:ns_attributes forComponent:ns_ref];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:ns_ref
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"updateAttrs"
options:@{@"threadName":WXTDOMThread}];
page->CallBridgeTime(getCurrentTime() - startTime);
return 0;
@@ -568,7 +559,6 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
}
[manager startComponentTasks];
[manager createFinish];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:nil
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"createFinish"
options:@{@"threadName":WXTDOMThread}];
page->CallBridgeTime(getCurrentTime() - startTime);
return 0;
@@ -595,7 +585,6 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
}
[manager startComponentTasks];
[manager renderFinish];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:nil
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"renderFinish"
options:@{@"threadName":WXTDOMThread}];
page->CallBridgeTime(getCurrentTime() - startTime);
return 0;
@@ -624,7 +613,6 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
[manager startComponentTasks];
[manager removeComponent:ns_ref];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:ns_ref
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"removeElement"
options:@{@"threadName":WXTDOMThread}];
page->CallBridgeTime(getCurrentTime() - startTime);
return 0;
@@ -655,7 +643,6 @@ static void MergeBorderWidthValues(NSMutableDictionary*
dict,
[manager startComponentTasks];
[manager moveComponent:ns_ref toSuper:ns_parentRef atIndex:ns_index];
- [WXTracingManager startTracingWithInstanceId:ns_instanceId ref:ns_ref
className:nil name:WXTDomCall phase:WXTracingEnd functionName:@"moveElement"
options:@{@"threadName":WXTDOMThread}];
page->CallBridgeTime(getCurrentTime() - startTime);
return 0;
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
index 7577b3d918..a8fb37bbb9 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
@@ -30,7 +30,6 @@
#import "JSValue+Weex.h"
#import "WXSDKManager.h"
#import "WXExtendCallNativeManager.h"
-#import "WXTracingManager.h"
#import "WXExceptionUtils.h"
#import "WXBridgeContext.h"
#import "WXMonitor.h"
@@ -338,7 +337,6 @@ -
(void)registerCallNativeModule:(WXJSCallNativeModule)callNativeModuleBlock
NSInvocation *invocation = callNativeModuleBlock(instanceIdString,
moduleNameString, methodNameString, argsArray, optionsDic);
JSValue *returnValue = [JSValue
wx_valueWithReturnValueFromInvocation:invocation inContext:[JSContext
currentContext]];
- [WXTracingManager startTracingWithInstanceId:instanceIdString ref:nil
className:nil name:moduleNameString phase:WXTracingInstant
functionName:methodNameString options:nil];
return returnValue;
};
}
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m
b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m
index ba412d7f66..0161dd5f96 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m
@@ -28,7 +28,6 @@
#import "WXResourceRequest.h"
#import "WXResourceLoader.h"
#import "WXDebugTool.h"
-#import "WXTracingManager.h"
#import "WXMonitor.h"
#import "WXSDKInstance_performance.h"
#import "WXThreadSafeMutableArray.h"
@@ -178,13 +177,10 @@ - (void)createInstance:(NSString *)instance
}
__weak typeof(self) weakSelf = self;
WXPerformBlockOnBridgeThread(^(){
- [WXTracingManager startTracingWithInstanceId:instance ref:nil
className:nil name:WXTExecJS phase:WXTracingBegin
functionName:@"createInstance" options:@{@"threadName":WXTJSBridgeThread}];
[weakSelf.bridgeCtx createInstance:instance
template:temp
options:options
data:data];
- [WXTracingManager startTracingWithInstanceId:instance ref:nil
className:nil name:WXTExecJS phase:WXTracingEnd functionName:@"createInstance"
options:@{@"threadName":WXTJSBridgeThread}];
-
});
}
@@ -208,16 +204,13 @@ - (void)createInstance:(NSString *)instance
}
__weak typeof(self) weakSelf = self;
WXPerformBlockOnBridgeThread(^(){
- [WXTracingManager startTracingWithInstanceId:instance ref:nil
className:nil name:WXTExecJS phase:WXTracingBegin
functionName:@"createInstance" options:@{@"threadName":WXTJSBridgeThread}];
[weakSelf.bridgeCtx createInstance:instance
contents:contents
options:options
data:data];
- [WXTracingManager startTracingWithInstanceId:instance ref:nil
className:nil name:WXTExecJS phase:WXTracingEnd functionName:@"createInstance"
options:@{@"threadName":WXTJSBridgeThread}];
});
}
-
- (WXThreadSafeMutableArray *)instanceIdStack
{
if (_instanceIdStack) return _instanceIdStack;
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
index b800a6ea8c..6edbae14fb 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
@@ -35,7 +35,6 @@
#import "WXHandlerFactory.h"
#import "WXValidateProtocol.h"
#import "WXPrerenderManager.h"
-#import "WXTracingManager.h"
#import "WXSDKInstance_performance.h"
#import "WXRootView.h"
#import "WXComponent+Layout.h"
@@ -244,10 +243,8 @@ - (void)createBody:(NSString*)ref
return;
}
- [WXTracingManager
startTracingWithInstanceId:strongSelf.weexInstance.instanceId ref:ref
className:nil name:type phase:WXTracingBegin functionName:@"createBody"
options:@{@"threadName":WXTUIThread}];
strongSelf.weexInstance.rootView.wx_component =
strongSelf->_rootComponent;
[strongSelf.weexInstance.rootView
addSubview:strongSelf->_rootComponent.view];
- [WXTracingManager
startTracingWithInstanceId:strongSelf.weexInstance.instanceId ref:ref
className:nil name:type phase:WXTracingEnd functionName:@"createBody"
options:@{@"threadName":WXTUIThread}];
}];
}
@@ -327,9 +324,7 @@ - (void)addComponent:(NSString*)ref
return;
}
- [WXTracingManager
startTracingWithInstanceId:strongSelf.weexInstance.instanceId ref:ref
className:nil name:type phase:WXTracingBegin functionName:@"addElement"
options:@{@"threadName":WXTUIThread}];
[supercomponent insertSubview:component atIndex:index];
- [WXTracingManager
startTracingWithInstanceId:strongSelf.weexInstance.instanceId ref:ref
className:nil name:type phase:WXTracingEnd functionName:@"addElement"
options:@{@"threadName":WXTUIThread}];
}];
}
if([WXAnalyzerCenter isInteractionLogOpen]){
@@ -356,9 +351,7 @@ - (void)moveComponent:(NSString *)ref toSuper:(NSString
*)superRef atIndex:(NSIn
return;
}
- [WXTracingManager
startTracingWithInstanceId:strongSelf.weexInstance.instanceId ref:ref
className:nil name:nil phase:WXTracingBegin functionName:@"moveElement"
options:@{@"threadName":WXTUIThread}];
[component moveToSuperview:newSupercomponent atIndex:index];
- [WXTracingManager
startTracingWithInstanceId:strongSelf.weexInstance.instanceId ref:ref
className:nil name:nil phase:WXTracingEnd functionName:@"moveElement"
options:@{@"threadName":WXTUIThread}];
}];
}
@@ -395,12 +388,10 @@ - (void)removeComponent:(NSString *)ref
return;
}
- [WXTracingManager
startTracingWithInstanceId:strongSelf.weexInstance.instanceId ref:ref
className:nil name:nil phase:WXTracingBegin functionName:@"removeElement"
options:@{@"threadName":WXTUIThread}];
if (component.supercomponent) {
[component.supercomponent willRemoveSubview:component];
}
[component removeFromSuperview];
- [WXTracingManager
startTracingWithInstanceId:weakSelf.weexInstance.instanceId ref:ref
className:nil name:nil phase:WXTracingEnd functionName:@"removeElement"
options:@{@"threadName":WXTUIThread}];
}];
[self _checkFixedSubcomponentToRemove:component];
@@ -690,10 +681,8 @@ - (void)updateAttributes:(NSDictionary *)attributes
forComponent:(NSString *)ref
return;
}
- [WXTracingManager
startTracingWithInstanceId:strongSelf.weexInstance.instanceId ref:ref
className:nil name:nil phase:WXTracingBegin functionName:@"updateAttrs"
options:@{@"threadName":WXTUIThread}];
[component _updateAttributesOnMainThread:attributes];
[component readyToRender];
- [WXTracingManager
startTracingWithInstanceId:strongSelf.weexInstance.instanceId ref:ref
className:nil name:nil phase:WXTracingEnd functionName:@"updateAttrs"
options:@{@"threadName":WXTUIThread}];
}];
}
@@ -878,7 +867,6 @@ - (void)renderFinish
UIView *rootView = instance.rootView;
[instance.performance onInstanceRenderSuccess:instance];
if (instance.renderFinish) {
- [WXTracingManager startTracingWithInstanceId:instance.instanceId
ref:nil className:nil name:nil phase:WXTracingInstant
functionName:WXTRenderFinish options:@{@"threadName":WXTUIThread}];
instance.renderFinish(rootView);
}
}];
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
deleted file mode 100644
index 1ad53e707e..0000000000
--- a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "WXSDKInstance.h"
-
-#define WXTNetworkHanding @"loadJS"
-#define WXTExecJS @"execJS"
-#define WXTJSCall @"jsCall"
-#define WXTDomCall @"domCall"
-#define WXTRender @"render"
-#define WXTRenderFinish @"renderFinish"
-
-#define WXTJSBridgeThread @"JSThread"
-#define WXTDOMThread @"DOMThread"
-#define WXTUIThread @"UIThread"
-#define WXTMainThread @"MainThread"
-
-#define WXTracingBegin @"B"
-#define WXTracingEnd @"E"
-#define WXTracingDuration @"D"
-#define WXTracingInstant @"i"
-
-#define WXTracingDurationDefault 0
-
-typedef enum : NSUInteger {
- // global
- WXTracingNetworkHanding = 0,
- WXTracingDataHanding,
- WXTracingRender
-} WXTracingTag;
-
-
-@interface WXTracingApi:NSObject
-
-@property (nonatomic, copy) NSString *name; //
-@property (nonatomic, copy) NSString *className; //
-@property (nonatomic, copy) NSString *method; //
-
-@end
-
-@interface WXTracing:NSObject
-
-@property (nonatomic, copy) NSString *ref; // compnonet id
-@property (nonatomic, copy) NSString *parentRef; // 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; // functionName
-@property (nonatomic, copy) NSString *iid; // instance id
-@property (nonatomic) long long parentId;// parent event id
-@property (nonatomic, copy) NSString *bundleUrl;
-@property (nonatomic, copy) NSString *threadName;
-@property (nonatomic, strong) NSMutableArray *childrenRefs; // children ids
--(NSDictionary *)dictionary;
-@end
-
-@interface WXTracingTask:NSObject
-
-@property (nonatomic, copy) NSString *iid;
-@property (nonatomic) long long counter;
-@property (nonatomic, copy) NSString *tag;
-@property (nonatomic, copy) NSString *bundleUrl;
-@property (nonatomic, strong) NSMutableArray *tracings;
-@property (nonatomic, copy) NSString *bundleJSType; //
-
-@end
-
-@interface WXTracingManager : NSObject
-
-/**
- * @discusstion weex perfermance tracing state
- * @return isTracing , NO in the release environment.
- */
-+(BOOL)isTracing;
-/**
- * @discusstion set weex perfermance tracing state , you should use in
debug environment
- * @param isTracing YES weex will be traced, NO weex will not be traced .
- */
-+(void)switchTracing:(BOOL)isTracing;
-/**
- * @discusstion weex perfermance tracing state
- * @param iid the instance id.
- * @param ref the component ref
- * @param className the module or component class name
- * @param name the module or component name
- * @param phase the trace phase
- * @param functionName function name
- * @param options the optional refer:support ts,duration,parentRef
- */
-+(void)startTracingWithInstanceId:(NSString *)iid ref:(NSString*)ref
className:(NSString *)className name:(NSString *)name phase:(NSString *)phase
functionName:(NSString *)functionName options:(NSDictionary *)options;
-/**
- * @discusstion fetch tracing data
- * @return the tracing data
- */
-+(NSMutableDictionary*)getTracingData;
-
-/**
- * @discusstion clear tracing data
- */
-+(void)clearTracingData;
-
-/**
- * @discusstion get current time
- */
-+(NSTimeInterval)getCurrentTime;
-
-/**
- * @discusstion set bundle type
- * @param jsBundleString the bundle source.
- * @param iid the instance id.
- */
-+(void)setBundleJSType:(NSString *)jsBundleString instanceId:(NSString *)iid;
-/**
- * @discusstion fetch the weex moudle component handler info
- * @return the weex moudle component handler info
- */
-+(NSDictionary *)getTacingApi;
-
-/**
- * @discusstion commit tracing info
- * @param instanceId the instance id.
- */
-+(void )commitTracing:(NSString *)instanceId;
-
-/**
- * @discusstion commit summary info
- * @param instanceId the instance id.
- */
-+ (void)commitTracingSummaryInfo:(NSDictionary *)info withInstanceId:(NSString
*)instanceId;
-
-/**
- * @discusstion destroy Traincg Task by Instance
- * @param instanceId the instanceId.
- */
-+(void)destroyTraincgTaskWithInstance:(NSString *)instanceId;
-@end
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m
b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m
deleted file mode 100644
index e0f00e260e..0000000000
--- a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "WXTracingManager.h"
-#import "WXComponentFactory.h"
-#import "WXModuleFactory.h"
-#import "WXSDKManager.h"
-#import "WXComponentFactory.h"
-#import "WXModuleFactory.h"
-#import "WXHandlerFactory.h"
-#import "WXUtility.h"
-#import "WXComponentManager.h"
-#import "WXTracingProtocol.h"
-#import "WXSDKEngine.h"
-
-
-@implementation WXTracing
-
--(NSDictionary *)dictionary {
- return [NSDictionary
dictionaryWithObjectsAndKeys:self.ref?:@"",@"ref",self.parentRef?:@"",@"parentRef",self.className?:@"",@"className",self.name?:@"",@"name",self.ph?:@"",@"ph",@(self.ts),@"ts",@(self.traceId),@"traceId",@(self.duration),@"duration",self.fName?:@"",@"fName",self.iid?:@"",@"iid",@(self.parentId)?:0,@"parentId",self.threadName?:@"",@"tName",
nil];
-}
-@end
-
-@implementation WXTracingTask
-
-@end
-
-@interface WXTracingManager()
-
-@property (nonatomic) BOOL isTracing;
-@property (nonatomic, strong) NSMutableDictionary *tracingTasks; // every
instance have a task
-@property (nonatomic, copy) NSString *currentInstanceId; // every instance
have a task
-
-@end
-
-@implementation WXTracingManager
-
-
-+ (instancetype) sharedInstance{
-
- static WXTracingManager *instance = nil;
- static dispatch_once_t once;
-
- dispatch_once(&once, ^{
- instance = [[WXTracingManager alloc] initPrivate];
- });
-
- return instance;
-}
-
-- (instancetype) initPrivate{
- self = [super init];
- if(self){
- self.isTracing = NO;
- }
-
- return self;
-}
-
-+(void)switchTracing:(BOOL )isTracing
-{
- [WXTracingManager sharedInstance].isTracing = isTracing;
-}
-
-+(BOOL)isTracing
-{
- return [WXTracingManager sharedInstance].isTracing;
-}
-
-+(void)startTracing:(WXTracing *)tracing
-{
- if([self isTracing]){
- if(![WXTracingManager sharedInstance].tracingTasks){
- [WXTracingManager sharedInstance].tracingTasks =
[NSMutableDictionary new];
- }
- if(![[WXTracingManager sharedInstance].tracingTasks
objectForKey:tracing.iid]){
- WXTracingTask *task = [WXTracingTask new];
- task.iid = tracing.iid;
- if (tracing.iid) {
- [[WXTracingManager sharedInstance].tracingTasks setObject:task
forKey:tracing.iid];
- }
- }
- WXTracingTask *task = [[WXTracingManager sharedInstance].tracingTasks
objectForKey:tracing.iid];
- if(task.bundleUrl.length == 0){
- if(tracing.bundleUrl.length>0){
- task.bundleUrl = tracing.bundleUrl;
- }
- }
- if(!task.tracings){
- task.tracings = [NSMutableArray new];
- }
- if(WXFloatEqual(tracing.ts,0)){
- NSTimeInterval time=[[NSDate date] timeIntervalSince1970]*1000;
- tracing.ts = time;
- }
- if(WXFloatEqual(tracing.duration,0)){
- tracing.duration = WXTracingDurationDefault;
- }
- if(![WXTracingEnd isEqualToString:tracing.ph]){ // end is should not
update
- tracing.traceId = task.counter++;
- }
- if([WXTNetworkHanding isEqualToString:tracing.name] && [WXTracingBegin
isEqualToString:tracing.ph]){
- task.tag = WXTNetworkHanding;
- }
- NSTimeInterval ts = [[NSDate date] timeIntervalSince1970]*1000;
- tracing.ts = ts ;
- dispatch_async(dispatch_get_main_queue(), ^{
- [self updateTracings:task tracing:tracing];
- });
- }
-}
-
-+(void)setBundleJSType:(NSString *)jsBundleString instanceId:(NSString *)iid
-{
- if([self isTracing] && iid.length >0){
- WXTracingTask *task = [[WXTracingManager sharedInstance].tracingTasks
objectForKey:iid];
- if(jsBundleString.length >0){
- NSRange range = [jsBundleString rangeOfString:@"}"];
- if (range.location != NSNotFound) {
- NSString *searchStr = [jsBundleString
substringToIndex:range.location+range.length];
- if ([searchStr rangeOfString:@"Vue"].location != NSNotFound){
- task.bundleJSType = @"Vue";
- }else if([searchStr rangeOfString:@"Rax"].location !=
NSNotFound){
- task.bundleJSType = @"Rax";
- }else{
- task.bundleJSType = @"Weex";
- }
- }
- }
- }
-}
-
-+(void)clearTracingData
-{
- [WXTracingManager sharedInstance].tracingTasks = nil;
-}
-
-+(NSTimeInterval)getCurrentTime
-{
- if([self isTracing]){
- return [[NSDate date] timeIntervalSince1970]*1000;
- }
- return 0;
-}
-
-+(void)startTracingWithInstanceId:(NSString *)iid ref:(NSString*)ref
className:(NSString *)className name:(NSString *)name phase:(NSString *)phase
functionName:(NSString *)functionName options:(NSDictionary *)options
-{
- if([self isTracing]){
- WXTracing *tracing = [WXTracing new];
- tracing.parentId = -1;
- if(ref.length>0){
- tracing.ref = ref;
- }else {
- tracing.ref = @"";
- }
- if(className.length>0){
- tracing.className = className;
- }else {
- tracing.className = @"";
- }
- if(name.length>0){
- tracing.name = name;
- }
- if(functionName.length>0){
- tracing.fName = functionName;
- }
- if(phase.length>0){
- tracing.ph = phase;
- }
- if(iid.length>0){
- tracing.iid = iid;
- }
-
- if(options && options[@"ts"]){
- tracing.ts = [options[@"ts"] floatValue];
- }
- if(options && options[@"duration"]){
- tracing.duration = [options[@"duration"] floatValue];
- }
- if(options && options[@"parentRef"]){
- tracing.parentRef = options[@"parentRef"];
- }
- if(options && options[@"bundleUrl"]){
- tracing.bundleUrl = options[@"bundleUrl"];
- }
- if(options && options[@"threadName"]){
- tracing.threadName = options[@"threadName"];
- }
- if(options && options[@"componentData"]){
- tracing.childrenRefs = [self
getChildrenRefs:options[@"componentData"]];
- }
- [self startTracing:tracing];
- }
-}
-
-+ (NSMutableArray *)getChildrenRefs:(NSDictionary *)componentData
-{
- NSMutableArray *mArray = [NSMutableArray new];
- [self recursively:mArray componentData:componentData];
- return mArray;
-}
-
-+(void)recursively:(NSMutableArray *)mArray componentData:(NSDictionary
*)componentData
-{
- if([componentData valueForKey:@"children"]){
- NSArray *children = [componentData valueForKey:@"children"];
- for(NSDictionary *subcomponentData in children){
- NSString *ref = [subcomponentData objectForKey:@"ref"];
- if(ref){
- [mArray addObject:ref];
- }
- [self recursively:mArray componentData:subcomponentData];
- }
- }
-}
-
-+(WXTracing *)copyTracing:(WXTracing *)tracing
-{
- WXTracing *newTracing = [WXTracing new];
- if(tracing.ref.length>0){
- newTracing.ref = tracing.ref;
- }
- if(tracing.parentRef.length>0){
- newTracing.parentRef = tracing.parentRef;
- }
- 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>0){
- newTracing.parentId = tracing.parentId;
- }
- if(tracing.traceId>0){
- newTracing.traceId = tracing.traceId;
- }
- if(tracing.ts>0){
- newTracing.ts = tracing.ts;
- }
- if(tracing.threadName.length>0){
- newTracing.threadName = tracing.threadName;
- }
- 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;
-}
-
-+(NSInteger )getParentId:(WXTracingTask *)task tracing:(WXTracing *)tracing
-{
- NSMutableArray *tracings = task.tracings;
- if([tracing.threadName isEqualToString:WXTJSBridgeThread]) {
- return -1;
- }
- if(tracings && [tracings count]>0){
- for (NSInteger i = [tracings count] - 1; i >= 0; i--) {
- WXTracing *t = tracings[i];
-// if([t.threadName isEqualToString:WXTJSBridgeThread]&& [self
compareRef:tracing.ref withTracing:t] && ([t.name isEqualToString:tracing.name]
|| [t.name isEqualToString:WXTJSCall])){
- if([t.threadName isEqualToString:WXTJSBridgeThread]&& [self
compareRef:tracing.ref withTracing:t]){
- if([t.fName isEqualToString:tracing.fName]){
- return (NSInteger)t.traceId;
- }
- }
- }
- }
- return -1;
-}
-
-+(BOOL)compareRef:(NSString *)ref withTracing:(WXTracing *)tracing
-{
- if([tracing.ref isEqualToString:ref]){
- return YES;
- }
- if(tracing.childrenRefs && [tracing.childrenRefs count] > 0){
- for (NSString *childRef in tracing.childrenRefs) {
- if([childRef isEqualToString:ref]){
- return YES;
- }
- }
- }
- return NO;
-}
-
-+(void)updateTracings:(WXTracingTask *)task tracing:(WXTracing *)tracing
-{
- if([WXTNetworkHanding isEqualToString:task.tag]){
- if([WXTExecJS isEqualToString:tracing.name]){
- NSMutableArray *tracings = task.tracings;
- [tracings enumerateObjectsWithOptions:NSEnumerationReverse
usingBlock:^(WXTracing *bTracing, NSUInteger idx, BOOL *stop) {
- if(([WXTNetworkHanding isEqualToString:bTracing.name] ||
[bTracing.ref isEqualToString:tracing.ref])&&[WXTracingBegin
isEqualToString:bTracing.ph]){
- WXTracing *newTracing = [self copyTracing:bTracing];
- newTracing.iid = tracing.iid;
- newTracing.ph = WXTracingEnd;
- newTracing.ts = tracing.ts ;
- newTracing.duration = newTracing.ts - bTracing.ts ;
- bTracing.duration = newTracing.duration;
- [task.tracings addObject:newTracing];
- *stop = YES;
- }
- }];
- task.tag = WXTExecJS;
- }
- }
-
- if([WXTracingBegin isEqualToString:tracing.ph]){
- if(tracing.ref.length>0){
- WXPerformBlockOnComponentThread(^{
- WXSDKInstance *instance = [WXSDKManager
instanceForID:task.iid];
- WXComponent *com = [instance componentForRef:tracing.ref];
- if(task.bundleUrl.length == 0){
- task.bundleUrl = [instance.scriptURL absoluteString];
- }
- if(com.supercomponent){
- tracing.parentRef = com.supercomponent.ref;
- }
- tracing.name = com.type;
- if(tracing.className.length == 0){
- tracing.className = [self getclassName:tracing];
- }
- });
- if(tracing.parentId == -1){
- tracing.parentId = [self getParentId:task tracing:tracing];
- }
- } else {
- if(tracing.parentId == -1){
- tracing.parentId = [self getParentId:task tracing:tracing];
- }
- }
-
- }
- if([WXTracingEnd isEqualToString:tracing.ph]){ // deal end
- NSMutableArray *tracings = task.tracings;
- [tracings enumerateObjectsWithOptions:NSEnumerationReverse
usingBlock:^(WXTracing *bTracing, NSUInteger idx, BOOL *stop) {
- if(tracing.ref.length > 0 && bTracing.ref.length>0){
- if(![tracing.ref isEqualToString:bTracing.ref]){
- return ;
- }
- }
-
- if([bTracing.fName isEqualToString:tracing.fName]
&&[WXTracingBegin isEqualToString:bTracing.ph] ){
- tracing.iid = bTracing.iid;
- if(bTracing.ref.length > 0){
- tracing.ref = bTracing.ref;
- }
- if(bTracing.parentRef.length > 0){
- tracing.parentRef = bTracing.parentRef;
- }
- tracing.parentId = bTracing.parentId;
- tracing.duration = tracing.ts - bTracing.ts ;
- tracing.traceId = bTracing.traceId;
- tracing.threadName = bTracing.threadName;
- bTracing.duration = tracing.duration;
- tracing.name = bTracing.name;
- *stop = YES;
- }
- }];
- }
-
- [task.tracings addObject:tracing];
- if([@"renderFinish" isEqualToString:tracing.fName] && [WXTracingInstant
isEqualToString:tracing.ph] && [WXTUIThread
isEqualToString:tracing.threadName]) {
- [WXTracingManager commitTracing:task.iid];
- }
-}
-
-+(NSMutableDictionary *)getTracingData
-{
- if(![self isTracing]){
- return nil;
- }
-
- return [WXTracingManager sharedInstance].tracingTasks;
-}
-
-+(NSDictionary *)getTacingApi
-{
- if(![self isTracing]){
- return @{};
- }
- NSMutableDictionary *dict = [NSMutableDictionary new];
- NSMutableArray *componetArray = [NSMutableArray new];
- NSMutableArray *moduleArray = [NSMutableArray new];
- NSMutableArray *handleArray = [NSMutableArray new];
- NSDictionary *componentConfigs = [WXComponentFactory componentConfigs];
- void (^componentBlock)(id, id, BOOL *) = ^(id mKey, id mObj, BOOL * mStop)
{
- NSMutableDictionary *componentConfig = [mObj mutableCopy];
- NSDictionary *cDict = [WXComponentFactory
componentSelectorMapsWithName:componentConfig[@"name"]];
- if(cDict && [cDict count]>0 && [cDict[@"methods"] count]>0){
- [componentConfig setObject:cDict[@"methods"] forKey:@"methods"];
- }
- [componetArray addObject:componentConfig];
- };
- [componentConfigs enumerateKeysAndObjectsUsingBlock:componentBlock];
- if(componetArray && [componetArray count]>0){
- [dict setObject:componetArray forKey:@"componet"];
- }
- NSDictionary *moduleConfigs = [WXModuleFactory moduleConfigs];
- void (^moduleBlock)(id, id, BOOL *) = ^(id mKey, id mObj, BOOL * mStop) {
- NSDictionary *mDict = [WXModuleFactory
moduleSelectorMapsWithName:mKey];
- NSMutableDictionary *subDict = [NSMutableDictionary new];
- [subDict setObject:mKey forKey:@"name"];
- [subDict setObject:mObj forKey:@"class"];
- if([mDict objectForKey:mKey]){
- [subDict setObject:[mDict objectForKey:mKey] forKey:@"methods"];
- }
- [moduleArray addObject:subDict];
- };
- [moduleConfigs enumerateKeysAndObjectsUsingBlock:moduleBlock];
- if(moduleArray && [moduleArray count]>0){
- [dict setObject:moduleArray forKey:@"module"];
- }
-
- NSDictionary *handleConfigs = [[WXHandlerFactory handlerConfigs]
mutableCopy];
- void (^handleBlock)(id, id, BOOL *) = ^(id mKey, id mObj, BOOL * mStop) {
- NSMutableDictionary *subDict = [NSMutableDictionary new];
- [subDict setObject:mKey forKey:@"class"];
- [subDict setObject:NSStringFromClass([mObj class]) forKey:@"name"];
- [handleArray addObject:subDict];
- };
- [handleConfigs enumerateKeysAndObjectsUsingBlock:handleBlock];
- if(handleArray && [handleArray count]>0){
- [dict setObject:handleArray forKey:@"handle"];
- }
-
- return dict;
-}
-
-+ (void)commitTracing:(NSString *)instanceId
-{
- if(![self isTracing]){
- return ;
- }
- id tracingHandle = [WXSDKEngine
handlerForProtocol:@protocol(WXTracingProtocol)];
- if ([tracingHandle respondsToSelector:@selector(commitTracingInfo:)]){
- WXTracingTask *task = [[WXTracingManager sharedInstance].tracingTasks
objectForKey:instanceId];
- if(task) {
- [tracingHandle commitTracingInfo:task];
- }
-
- }
-}
-
-+ (void)commitTracingSummaryInfo:(NSDictionary *)info withInstanceId:(NSString
*)instanceId
-{
- if(![self isTracing]){
- return ;
- }
- id tracingHandle = [WXSDKEngine
handlerForProtocol:@protocol(WXTracingProtocol)];
- if ([tracingHandle
respondsToSelector:@selector(commitTracingSummaryInfo:)]){
- if(info) {
- NSMutableDictionary *newInfo = [info mutableCopy];
- if(instanceId.length > 0){
- [newInfo setObject:instanceId forKey:@"instanceId"];
- [newInfo setObject:[[WXUtility getEnvironment]
objectForKey:@"platform"] forKey:@"platform"];
- }
- [tracingHandle commitTracingSummaryInfo:newInfo];
- }
-
- }
-}
-
-+(void)destroyTraincgTaskWithInstance:(NSString *)instanceId
-{
- if(![self isTracing]){
- return ;
- }
- WXTracingTask *task = [[WXTracingManager sharedInstance].tracingTasks
objectForKey:instanceId];
- if(task){
- [[WXTracingManager sharedInstance].tracingTasks
removeObjectForKey:instanceId];
- }
-}
-
-@end
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
index 234676ee55..cb7f4dce67 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
@@ -35,7 +35,6 @@
#import <pthread/pthread.h>
#import "WXComponent+PseudoClassManagement.h"
#import "WXComponent+BoxShadow.h"
-#import "WXTracingManager.h"
#import "WXComponent+Events.h"
#import "WXComponent+Layout.h"
#import "WXConfigCenterProtocol.h"
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index a43b554aad..65c50b486f 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -42,9 +42,7 @@
#import "WXTextComponent.h"
#import "WXConvert.h"
#import "WXPrerenderManager.h"
-#import "WXTracingManager.h"
#import "WXJSExceptionProtocol.h"
-#import "WXTracingManager.h"
#import "WXExceptionUtils.h"
#import "WXMonitor.h"
#import "WXBridgeContext.h"
@@ -242,7 +240,6 @@ - (void)renderWithURL:(NSURL *)url options:(NSDictionary
*)options data:(id)data
self.needValidate = [[WXHandlerFactory
handlerForProtocol:@protocol(WXValidateProtocol)] needValidate:url];
WXResourceRequest *request = [WXResourceRequest requestWithURL:url
resourceType:WXResourceTypeMainBundle referrer:@""
cachePolicy:NSURLRequestUseProtocolCachePolicy];
[self _renderWithRequest:request options:options data:data];
- [WXTracingManager startTracingWithInstanceId:self.instanceId ref:nil
className:nil name:WXTNetworkHanding phase:WXTracingBegin
functionName:@"renderWithURL" options:@{@"bundleUrl":url?[url
absoluteString]:@"",@"threadName":WXTMainThread}];
}
- (void)renderView:(id)source options:(NSDictionary *)options data:(id)data
@@ -255,7 +252,6 @@ - (void)renderView:(id)source options:(NSDictionary
*)options data:(id)data
if ([source isKindOfClass:[NSString class]]) {
WXLogDebug(@"Render source: %@, data:%@", self, [WXUtility
JSONString:data]);
[self _renderWithMainBundleString:source];
- [WXTracingManager setBundleJSType:source instanceId:self.instanceId];
} else if ([source isKindOfClass:[NSData class]]) {
[self _renderWithData:source];
}
@@ -336,11 +332,9 @@ - (void)_renderWithData:(NSData *)contents
return;
}
- [WXTracingManager startTracingWithInstanceId:self.instanceId ref:nil
className:nil name:WXTExecJS phase:WXTracingBegin
functionName:@"_renderWithData" options:@{@"threadName":WXTMainThread}];
[[WXSDKManager bridgeMgr] createInstance:self.instanceId contents:contents
options:dictionary data:_jsData];
- [WXTracingManager startTracingWithInstanceId:self.instanceId ref:nil
className:nil name:WXTExecJS phase:WXTracingEnd functionName:@"_renderWithData"
options:@{@"threadName":WXTMainThread}];
- // WX_MONITOR_PERF_SET(WXPTBundleSize, [data length], self);
+ // WX_MONITOR_PERF_SET(WXPTBundleSize, [data length], self);
_isRendered = YES;
}
@@ -429,9 +423,7 @@ - (void)_renderWithMainBundleString:(NSString
*)mainBundleString
return;
}
- [WXTracingManager startTracingWithInstanceId:self.instanceId ref:nil
className:nil name:WXTExecJS phase:WXTracingBegin
functionName:@"renderWithMainBundleString"
options:@{@"threadName":WXTMainThread}];
[[WXSDKManager bridgeMgr] createInstance:self.instanceId
template:mainBundleString options:dictionary data:_jsData];
- [WXTracingManager startTracingWithInstanceId:self.instanceId ref:nil
className:nil name:WXTExecJS phase:WXTracingEnd
functionName:@"renderWithMainBundleString"
options:@{@"threadName":WXTMainThread}];
WX_MONITOR_PERF_SET(WXPTBundleSize, [mainBundleString
lengthOfBytesUsingEncoding:NSUTF8StringEncoding], self);
@@ -558,14 +550,11 @@ - (void)_renderWithRequest:(WXResourceRequest *)request
options:(NSDictionary *)
return;
}
}
-
[strongSelf.apmInstance onStage:KEY_PAGE_STAGES_DOWN_BUNDLE_END];
[strongSelf.apmInstance
updateExtInfoFromResponseHeader:response.allHeaderFields];
[strongSelf _renderWithMainBundleString:jsBundleString];
- [WXTracingManager setBundleJSType:jsBundleString
instanceId:weakSelf.instanceId];
[WXMonitor performanceFinishWithState:DebugAfterRequest
instance:strongSelf];
-
};
_mainBundleLoader.onFailed = ^(NSError *loadError) {
@@ -632,8 +621,6 @@ - (void)destroyInstance
[pageEvent pageDestroy:self.instanceId];
}
[[NSNotificationCenter defaultCenter]
postNotificationName:WX_INSTANCE_WILL_DESTROY_NOTIFICATION object:nil
userInfo:@{@"instanceId":self.instanceId}];
-
- [WXTracingManager destroyTraincgTaskWithInstance:self.instanceId];
[WXPrerenderManager removePrerenderTaskforUrl:[self.scriptURL
absoluteString]];
[WXPrerenderManager destroyTask:self.instanceId];
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXDomModule.m
b/ios/sdk/WeexSDK/Sources/Module/WXDomModule.m
index a3de95b683..f65f61a376 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXDomModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXDomModule.m
@@ -28,7 +28,6 @@
#import "WXUtility.h"
#import "WXRuleManager.h"
#import "WXSDKInstance.h"
-#import "WXTracingManager.h"
#import "WXRecycleListComponent.h"
#import "WXCoreBridge.h"
#import <objc/message.h>
@@ -109,7 +108,6 @@ - (void)createBody:(NSDictionary *)bodyData
{
NSString* instanceId = self.weexInstance.instanceId;
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId
ref:bodyData[@"ref"] className:nil name:WXTDomCall phase:WXTracingBegin
functionName:@"createBody" options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callCreateBody:instanceId data:bodyData];
});
}
@@ -118,7 +116,6 @@ - (void)addElement:(NSString *)parentRef
element:(NSDictionary *)elementData atI
{
NSString* instanceId = self.weexInstance.instanceId;
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId
ref:elementData[@"ref"] className:nil name:WXTDomCall phase:WXTracingBegin
functionName:@"addElement" options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callAddElement:instanceId parentRef:parentRef
data:elementData index:(int)index];
});
}
@@ -127,7 +124,6 @@ - (void)removeElement:(NSString *)ref
{
NSString* instanceId = self.weexInstance.instanceId;
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin
functionName:@"removeElement" options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callRemoveElement:instanceId ref:ref];
});
}
@@ -136,7 +132,6 @@ - (void)moveElement:(NSString *)ref parentRef:(NSString
*)parentRef index:(NSInt
{
NSString* instanceId = self.weexInstance.instanceId;
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"moveElement"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callMoveElement:instanceId ref:ref parentRef:parentRef
index:(int)index];
});
}
@@ -145,7 +140,6 @@ - (void)addEvent:(NSString *)ref event:(NSString *)event
{
NSString* instanceId = self.weexInstance.instanceId;
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"addEvent"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callAddEvent:instanceId ref:ref event:event];
});
}
@@ -154,7 +148,6 @@ - (void)removeEvent:(NSString *)ref event:(NSString *)event
{
NSString* instanceId = self.weexInstance.instanceId;
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"removeEvent"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callRemoveEvent:instanceId ref:ref event:event];
});
}
@@ -163,7 +156,6 @@ - (void)createFinish
{
NSString* instanceId = self.weexInstance.instanceId;
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:nil
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"createFinish"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callCreateFinish:instanceId];
});
}
@@ -172,7 +164,6 @@ - (void)updateFinish
{
NSString* instanceId = self.weexInstance.instanceId;
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:nil
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"updateFinish"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callUpdateFinish:instanceId];
});
}
@@ -181,7 +172,6 @@ - (void)refreshFinish
{
NSString* instanceId = self.weexInstance.instanceId;
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:nil
className:nil name:WXTDomCall phase:WXTracingBegin
functionName:@"refreshFinish" options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callRefreshFinish:instanceId];
});
}
@@ -197,7 +187,6 @@ - (void)updateStyle:(NSString *)ref styles:(NSDictionary
*)styles
{
NSString* instanceId = self.weexInstance.instanceId;
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"updateStyle"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callUpdateStyle:instanceId ref:ref data:styles];
});
}
@@ -206,7 +195,6 @@ - (void)updateAttrs:(NSString *)ref attrs:(NSDictionary
*)attrs
{
NSString* instanceId = self.weexInstance.instanceId;
WXPerformBlockOnComponentThread(^{
- [WXTracingManager startTracingWithInstanceId:instanceId ref:ref
className:nil name:WXTDomCall phase:WXTracingBegin functionName:@"updateAttrs"
options:@{@"threadName":WXTDOMThread}];
[WXCoreBridge callUpdateAttrs:instanceId ref:ref data:attrs];
});
}
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m
b/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m
index 6adf919717..822b5cee72 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m
@@ -25,7 +25,6 @@
#import "WXBridgeManager.h"
#import "WXSDKEngine.h"
#import "WXUtility.h"
-#import "WXTracingManager.h"
static NSString *const MSG_PRERENDER_INTERNAL_ERROR = @"internal_error";
static NSString *const MSG_PRERENDER_SUCCESS = @"success";
diff --git a/ios/sdk/WeexSDK/Sources/Monitor/WXAnalyzerCenter.m
b/ios/sdk/WeexSDK/Sources/Monitor/WXAnalyzerCenter.m
index f058b48f35..eac8facf7c 100644
--- a/ios/sdk/WeexSDK/Sources/Monitor/WXAnalyzerCenter.m
+++ b/ios/sdk/WeexSDK/Sources/Monitor/WXAnalyzerCenter.m
@@ -23,7 +23,6 @@
#import "WXAppMonitorProtocol.h"
#import "WXSDKManager.h"
#import "WXLog.h"
-#import "WXTracingManager.h"
#import "WXAnalyzerCenter.h"
#import "WXAnalyzerCenter+Transfer.h"
#import "WXUtility.h"
diff --git a/ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m
b/ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m
index ccd18854ee..297b31fcae 100644
--- a/ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m
+++ b/ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m
@@ -27,7 +27,6 @@
#import "WXComponentManager.h"
#import "WXThreadSafeMutableDictionary.h"
#import "WXAppConfiguration.h"
-#import "WXTracingManager.h"
#import "WXAnalyzerProtocol.h"
#import "WXSDKInstance_performance.h"
#import "WXAnalyzerCenter+Transfer.h"
@@ -240,7 +239,6 @@ + (void)commitPerformanceWithDict:(NSMutableDictionary
*)commitDict instance:(WX
}
[self printPerformance:commitDict];
- [WXTracingManager commitTracingSummaryInfo:commitDict
withInstanceId:instance.instanceId];
}
}
diff --git a/ios/sdk/WeexSDK/Sources/Protocol/WXTracingProtocol.h
b/ios/sdk/WeexSDK/Sources/Protocol/WXTracingProtocol.h
deleted file mode 100644
index 4b7f1400e1..0000000000
--- a/ios/sdk/WeexSDK/Sources/Protocol/WXTracingProtocol.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "WXTracingProtocol.h"
-#import "WXTracingManager.h"
-
-@protocol WXTracingProtocol <NSObject>
-
-- (void)commitTracingInfo:(WXTracingTask *)task;
-
-- (void)commitTracingSummaryInfo:(NSDictionary *)info;
-
-@end
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m
b/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m
index c2a5ce8fbd..33b94f3cae 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m
@@ -20,8 +20,8 @@
#import "WXVersion.h"
#import "WXDefine.h"
-static const char* WeexSDKBuildTime = "2018-12-10 09:36:44 UTC";
-static const unsigned long WeexSDKBuildTimestamp = 1544434604;
+static const char* WeexSDKBuildTime = "2019-01-03 06:00:23 UTC";
+static const unsigned long WeexSDKBuildTimestamp = 1546495223;
NSString* GetWeexSDKVersion(void)
{
diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm
b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm
index 24842add75..d2a3e92be9 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm
@@ -24,7 +24,6 @@
#import "WXView.h"
#import "WXSDKInstance_private.h"
#import "WXTransform.h"
-#import "WXTracingManager.h"
#import "WXSDKManager.h"
#import "WXComponent+Layout.h"
diff --git a/ios/sdk/WeexSDK/Sources/WeexSDK.h
b/ios/sdk/WeexSDK/Sources/WeexSDK.h
index a611390951..4389bf43be 100644
--- a/ios/sdk/WeexSDK/Sources/WeexSDK.h
+++ b/ios/sdk/WeexSDK/Sources/WeexSDK.h
@@ -29,8 +29,6 @@
#import "WXUtility.h"
#import "WXURLRewriteProtocol.h"
#import "WXType.h"
-#import "WXTracingProtocol.h"
-#import "WXTracingManager.h"
#import "WXScrollerProtocol.h"
#import "WXScrollerComponent.h"
#import "WXSDKManager.h"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
