Skip to content

Commit

Permalink
ProfileSwiftUI menu item. (#501)
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnno1962
johnno1962 authored May 2, 2024
1 parent 05e19b4 commit c4dcf40
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 10 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
[submodule "SwiftRegex5"]
path = SwiftRegex5
url = https://github.com/johnno1962/SwiftRegex5
[submodule "ProfileSwiftUI"]
path = ProfileSwiftUI
url = https://github.com/johnno1962/ProfileSwiftUI
2 changes: 1 addition & 1 deletion DLKit
Submodule DLKit updated 13 files
+1 −1 Package.swift
+3 −2 README.md
+15 −132 Sources/DLKit/DLKit.swift
+54 −0 Sources/DLKit/Demangling.swift
+70 −0 Sources/DLKit/FileSymbols.swift
+135 −0 Sources/DLKit/ImageSymbols.swift
+34 −5 Sources/DLKit/Interposing.swift
+18 −13 Sources/DLKit/Iterators.swift
+59 −13 Sources/DLKitC/DLKitC.c
+34 −8 Sources/DLKitC/include/DLKitC.h
+166 −0 Sources/DLKitC/trie_dladdr.mm
+232 −0 Sources/DLKitC/trie_dlops.mm
+2 −2 Tests/DLKitTests/DLKitTests.swift
2 changes: 1 addition & 1 deletion HotReloading
Submodule HotReloading updated 6 files
+ − Contents/Resources/Base.lproj/MainMenu.nib
+7 −4 Package.swift
+6 −1 Sources/HotReloading/InjectionClient.swift
+6 −2 Sources/HotReloadingGuts/ClientBoot.mm
+2 −1 Sources/HotReloadingGuts/include/InjectionClient.h
+6 −1 Sources/injectiond/AppDelegate.swift
18 changes: 16 additions & 2 deletions InjectionIII.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
BB34C3FD244FAAB400D520A9 /* RMWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB34C3FC244FAAB400D520A9 /* RMWindowController.xib */; };
BB34C3FF244FAD3C00D520A9 /* log.html in Resources */ = {isa = PBXBuildFile; fileRef = BB34C3FE244FAD3C00D520A9 /* log.html */; };
BB34C401244FAE3000D520A9 /* iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = BB34C400244FAE2F00D520A9 /* iphone.png */; };
BB3756FF2BCC269400CE5D05 /* DLKitC.c in Sources */ = {isa = PBXBuildFile; fileRef = BBD0AB40262F2549003ED7B1 /* DLKitC.c */; };
BB3757042BCC26DD00CE5D05 /* trie_dlops.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB3757022BCC26DD00CE5D05 /* trie_dlops.mm */; };
BB3757052BCC26DD00CE5D05 /* trie_dladdr.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB3757032BCC26DD00CE5D05 /* trie_dladdr.mm */; };
BB3757072BCC385F00CE5D05 /* ProfileSwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3757002BCC26AE00CE5D05 /* ProfileSwiftUI.swift */; };
BB439B801FABA64300B4F50B /* SwiftEvalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB439B7F1FABA64300B4F50B /* SwiftEvalTests.swift */; };
BB4EC3FB244FA3C40079E244 /* RMMacroManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BB4EC3F7244FA3C30079E244 /* RMMacroManager.m */; };
BB4EC3FC244FA3C40079E244 /* RMDeviceController.m in Sources */ = {isa = PBXBuildFile; fileRef = BB4EC3F8244FA3C30079E244 /* RMDeviceController.m */; };
Expand Down Expand Up @@ -187,6 +191,9 @@
BB34C3FC244FAAB400D520A9 /* RMWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RMWindowController.xib; path = Remote/Classes/RMWindowController.xib; sourceTree = SOURCE_ROOT; };
BB34C3FE244FAD3C00D520A9 /* log.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = log.html; path = Remote/log.html; sourceTree = SOURCE_ROOT; };
BB34C400244FAE2F00D520A9 /* iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iphone.png; path = Remote/iphone.png; sourceTree = SOURCE_ROOT; };
BB3757002BCC26AE00CE5D05 /* ProfileSwiftUI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ProfileSwiftUI.swift; path = ProfileSwiftUI/Sources/ProfileSwiftUI/ProfileSwiftUI.swift; sourceTree = SOURCE_ROOT; };
BB3757022BCC26DD00CE5D05 /* trie_dlops.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = trie_dlops.mm; path = DLKit/Sources/DLKitC/trie_dlops.mm; sourceTree = SOURCE_ROOT; };
BB3757032BCC26DD00CE5D05 /* trie_dladdr.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = trie_dladdr.mm; path = DLKit/Sources/DLKitC/trie_dladdr.mm; sourceTree = SOURCE_ROOT; };
BB439B681FABA64300B4F50B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
BB439B6A1FABA64300B4F50B /* MasterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterViewController.swift; sourceTree = "<group>"; };
BB439B6C1FABA64300B4F50B /* DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -624,9 +631,12 @@
BBAD6A2B290915DB00DEB1A5 /* InjectionStats.swift */,
BBC03BC626282358005C1A06 /* SwiftSweeper.swift */,
BB18D2E7274E1746004BB4A5 /* DynamicCast.swift */,
BB3757002BCC26AE00CE5D05 /* ProfileSwiftUI.swift */,
BBD0AB3D262F24E4003ED7B1 /* DLKit.swift */,
BBD0AB43262F256B003ED7B1 /* DLKitC.h */,
BBD0AB40262F2549003ED7B1 /* DLKitC.c */,
BB3757032BCC26DD00CE5D05 /* trie_dladdr.mm */,
BB3757022BCC26DD00CE5D05 /* trie_dlops.mm */,
BBD0AB3F262F2549003ED7B1 /* fishhook.c */,
BBC03BBC2625F268005C1A06 /* Unhide.mm */,
BBB64FE41FD576AA0020BE47 /* XprobeSwift-Bridging-Header.h */,
Expand Down Expand Up @@ -1076,10 +1086,14 @@
BB16654025EC6163001407AE /* Xprobe.mm in Sources */,
BB04337928D319F60007577F /* FileWatcher.swift in Sources */,
BBC03BC726282358005C1A06 /* SwiftSweeper.swift in Sources */,
BB3756FF2BCC269400CE5D05 /* DLKitC.c in Sources */,
BBCB31C9281677C900081CB6 /* SwiftInterpose.swift in Sources */,
BBC03BBE2625F269005C1A06 /* Unhide.mm in Sources */,
BBAD6A2C290915DE00DEB1A5 /* InjectionStats.swift in Sources */,
BB3757052BCC26DD00CE5D05 /* trie_dladdr.mm in Sources */,
BB18D2E8274E1748004BB4A5 /* DynamicCast.swift in Sources */,
BB3757042BCC26DD00CE5D05 /* trie_dlops.mm in Sources */,
BB3757072BCC385F00CE5D05 /* ProfileSwiftUI.swift in Sources */,
BBF3D62B2851E6DF0070356F /* ReducerInjection.swift in Sources */,
BB16653E25EC5FE0001407AE /* InjectionClient.swift in Sources */,
BBC03BC12625F27C005C1A06 /* UnhidingEval.swift in Sources */,
Expand Down Expand Up @@ -1481,7 +1495,7 @@
INFOPLIST_FILE = InjectionIII/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 4.8.4;
MARKETING_VERSION = 5.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.johnholdsworth.InjectionIII;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -1505,7 +1519,7 @@
INFOPLIST_FILE = InjectionIII/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 4.8.4;
MARKETING_VERSION = 5.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.johnholdsworth.InjectionIII;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
11 changes: 9 additions & 2 deletions InjectionIII/Base.lproj/MainMenu.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,11 +752,18 @@
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Method Tracing" autoenablesItems="NO" id="LL4-BA-XJf">
<items>
<menuItem title="Trace Main Bundle" allowsKeyEquivalentWhenHidden="YES" toolTip="Log methods defined in app's main bundle." id="3ZO-RG-jcD">
<menuItem title="Profile SwiftUI" allowsKeyEquivalentWhenHidden="YES" toolTip="Log methods defined in app's main bundle." id="3ZO-RG-jcD">
<modifierMask key="keyEquivalentModifierMask"/>
<accessibility description="Trace App"/>
<connections>
<action selector="traceUIApp:" target="Voe-Tx-rLC" id="oc5-Cw-bGO"/>
<action selector="profileSwiftUI:" target="Voe-Tx-rLC" id="v83-nh-7xV"/>
</connections>
</menuItem>
<menuItem title="Trace Main Bundle" allowsKeyEquivalentWhenHidden="YES" toolTip="Log methods defined in app's main bundle." id="shg-Kq-kHd">
<modifierMask key="keyEquivalentModifierMask"/>
<accessibility description="Trace App"/>
<connections>
<action selector="traceUIApp:" target="Voe-Tx-rLC" id="Whr-wk-3ZR"/>
</connections>
</menuItem>
<menuItem title="Trace Injected" tag="1" toolTip="Trace functions that have been injected." id="CQY-su-z8C">
Expand Down
2 changes: 1 addition & 1 deletion InjectionIII/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>8043</string>
<string>8075</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string>
<key>LSMinimumSystemVersion</key>
Expand Down
1 change: 1 addition & 0 deletions ProfileSwiftUI
Submodule ProfileSwiftUI added at 7e9092
2 changes: 1 addition & 1 deletion SwiftRegex5
Submodule SwiftRegex5 updated 3 files
+4 −1 README.md
+3 −8 SwiftRegex5.playground/Sources/TupleRegex.swift
+13 −0 SwiftRegex5Tests/SwiftRegex5Tests.swift
2 changes: 1 addition & 1 deletion SwiftTrace
Submodule SwiftTrace updated 4 files
+3 −3 SwiftTrace/SwiftSwizzle.swift
+2 −2 SwiftTraceGuts/fast_dladdr.mm
+14 −8 SwiftTraceGuts/fishhook.c
+8 −4 SwiftTraceGuts/include/fishhook.h
2 changes: 1 addition & 1 deletion XprobePlugin
Submodule XprobePlugin updated 2 files
+3 −1 Sources/Xprobe/SweepSeeding.m
+3 −1 Sources/XprobeSwift/XprobeSwift.swift

0 comments on commit c4dcf40

Please sign in to comment.