Skip to content

Commit

Permalink
Merge pull request #608 from Tencent/dev
Browse files Browse the repository at this point in the history 
Matrix for iOS v1.0.1
  • Loading branch information
@gryamy
gryamy committed Jun 29, 2021
2 parents b7b4864 + effff0e commit 21c70cd
Show file tree
Hide file tree
Showing 39 changed files with 1,247 additions and 779 deletions.
6 changes: 3 additions & 3 deletions matrix-wechat.podspec
View file
Expand Up @@ -7,7 +7,7 @@

Pod::Spec.new do |matrix|
matrix.name = 'matrix-wechat'
matrix.version = '0.6.7'
matrix.version = '1.0.1'
matrix.summary = 'Matrix for iOS/macOS is a performance probe tool developed and used by WeChat.'
matrix.description = <<-DESC
Matrix for iOS/macOS is a performance probe tool developed and used by WeChat.
Expand All @@ -21,10 +21,10 @@ Pod::Spec.new do |matrix|
matrix.homepage = 'https://github.com/Tencent/matrix'
matrix.license = { :type => 'BSD', :file => 'LICENSE' }
matrix.author = { 'johnzjchen' => 'johnzjchen@tencent.com' }
matrix.source = { :git => 'https://github.com/Tencent/matrix.git', :branch => "feature/ios-matrix-cocopods-0.6.7" }
matrix.source = { :git => 'https://github.com/Tencent/matrix.git', :branch => "feature/ios-matrix-cocopods-1.0.1" }
matrix.module_name = "Matrix"

matrix.ios.deployment_target = '10.0'
matrix.ios.deployment_target = '9.0'
matrix.osx.deployment_target = "10.10"
matrix.libraries = "z", "c++"
matrix.frameworks = "CoreFoundation", "Foundation"
Expand Down
8 changes: 2 additions & 6 deletions matrix/matrix-iOS/Matrix/Matrix.xcodeproj/project.pbxproj
View file
Expand Up @@ -206,7 +206,6 @@
B9620E0825F238F900CD8AD7 /* splay_map.h in Headers */ = {isa = PBXBuildFile; fileRef = B9620E0425F238F900CD8AD7 /* splay_map.h */; };
B9620E0925F238F900CD8AD7 /* buffer_source.h in Headers */ = {isa = PBXBuildFile; fileRef = B9620E0525F238F900CD8AD7 /* buffer_source.h */; };
B9620E1825F2393A00CD8AD7 /* allocation_event_db_old.h in Headers */ = {isa = PBXBuildFile; fileRef = B9620E0D25F2393A00CD8AD7 /* allocation_event_db_old.h */; };
B9620E1925F2393A00CD8AD7 /* memory_logging_event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B9620E0E25F2393A00CD8AD7 /* memory_logging_event.cpp */; };
B9620E1A25F2393A00CD8AD7 /* memory_logging_event_buffer_pool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B9620E0F25F2393A00CD8AD7 /* memory_logging_event_buffer_pool.cpp */; };
B9620E1B25F2393A00CD8AD7 /* memory_logging_event_buffer_list.h in Headers */ = {isa = PBXBuildFile; fileRef = B9620E1025F2393A00CD8AD7 /* memory_logging_event_buffer_list.h */; };
B9620E1C25F2393A00CD8AD7 /* memory_logging_event_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B9620E1125F2393A00CD8AD7 /* memory_logging_event_buffer.cpp */; };
Expand Down Expand Up @@ -492,7 +491,6 @@
B9620E0425F238F900CD8AD7 /* splay_map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = splay_map.h; sourceTree = "<group>"; };
B9620E0525F238F900CD8AD7 /* buffer_source.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buffer_source.h; sourceTree = "<group>"; };
B9620E0D25F2393A00CD8AD7 /* allocation_event_db_old.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = allocation_event_db_old.h; sourceTree = "<group>"; };
B9620E0E25F2393A00CD8AD7 /* memory_logging_event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory_logging_event.cpp; sourceTree = "<group>"; };
B9620E0F25F2393A00CD8AD7 /* memory_logging_event_buffer_pool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory_logging_event_buffer_pool.cpp; sourceTree = "<group>"; };
B9620E1025F2393A00CD8AD7 /* memory_logging_event_buffer_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory_logging_event_buffer_list.h; sourceTree = "<group>"; };
B9620E1125F2393A00CD8AD7 /* memory_logging_event_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory_logging_event_buffer.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1134,7 +1132,6 @@
B9620E1325F2393A00CD8AD7 /* memory_logging_event_buffer_pool.h */,
B9620E0F25F2393A00CD8AD7 /* memory_logging_event_buffer_pool.cpp */,
B9620E1525F2393A00CD8AD7 /* memory_logging_event.h */,
B9620E0E25F2393A00CD8AD7 /* memory_logging_event.cpp */,
116834C722538BB500D6ED61 /* nsobject_hook_method.h */,
116834C822538BB500D6ED61 /* nsobject_hook_method.mm */,
BB77ACC722368582008C67D9 /* nsobject_hook.h */,
Expand Down Expand Up @@ -1475,7 +1472,6 @@
1127770325ECD92E00F7A6E4 /* KSCrash_BinaryImageHandler.mm in Sources */,
BB77AD1E22368582008C67D9 /* nsobject_hook.mm in Sources */,
116460B82111AF190069B5DE /* KSStackCursor_MachineContext.c in Sources */,
B9620E1925F2393A00CD8AD7 /* memory_logging_event.cpp in Sources */,
116460B92111AF190069B5DE /* KSCrashMonitor_Zombie.c in Sources */,
116460BA2111AF190069B5DE /* KSDynamicLinker.c in Sources */,
B9620E2225F2393A00CD8AD7 /* allocation_event_db_old.cpp in Sources */,
Expand Down Expand Up @@ -1613,7 +1609,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -1672,7 +1668,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MTL_ENABLE_DEBUG_INFO = NO;
VALIDATE_PRODUCT = YES;
Expand Down
9 changes: 3 additions & 6 deletions matrix/matrix-iOS/Matrix/WCMemoryStat/MemoryLogger/ObjectEvent/allocation_event.h
View file
Expand Up @@ -20,19 +20,16 @@
#include <mach/mach.h>

struct allocation_event {
//uint64_t address; // top 8 bits are actually the flags
uint16_t alloca_type; // allocation type, such as memory_logging_type_alloc or memory_logging_type_vm_allocate
uint16_t object_type; // object type, such as NSObject, NSData, CFString, etc...
uint32_t stack_identifier;
uint32_t size;
uint32_t t_id;
uint32_t object_type; // object type, such as NSObject, NSData, CFString, etc...
uint32_t alloca_type; // allocation type, such as memory_logging_type_alloc or memory_logging_type_vm_allocate

allocation_event(uint16_t _at = 0, uint16_t _ot = 0, uint32_t _si = 0, uint32_t _sz = 0, uint32_t _id = 0) {
allocation_event(uint32_t _at = 0, uint32_t _ot = 0, uint32_t _si = 0, uint32_t _sz = 0) {
alloca_type = _at;
object_type = _ot;
stack_identifier = _si;
size = _sz;
t_id = _id;
}
};

Expand Down

0 comments on commit 21c70cd

Please sign in to comment.