Compare commits

...
Author SHA1 Message Date
gronod 3c9e209289 feat(telemetry): implement Intel and AMD GPU telemetry provider (fixes #14)
MacMonitor CI/CD Pipeline / Build & Test (Intel x86_64) (push) Canceled after 0s
2026-09-08 12:44:06 +01:00
gronod 6e07fad771 Merge branch 'feat/12-process-details' into milestone/m3-advanced-telemetry
MacMonitor CI/CD Pipeline / Build & Test (Intel x86_64) (push) Canceled after 0s
2026-09-08 12:42:02 +01:00
5 changed files with 390 additions and 0 deletions
+120
View File
@@ -12,25 +12,41 @@
1879A3DCF6E305D7F2CD472E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2345555FF9780B02A90CC7A9 /* CoreFoundation.framework */; };
1B15F48F6B19E9EA4556ECD5 /* MMStorageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78325870C7CD8312AECA2236 /* MMStorageTests.swift */; };
1B3F1C8ABF0ADFAA290FF6F6 /* MMSMCParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 375AA781A2AA0A20B119C7B7 /* MMSMCParser.m */; };
2C0F7AB93691ED8AA86FBCF0 /* MMProcessDetailInspector.m in Sources */ = {isa = PBXBuildFile; fileRef = 52E641F8A664D456518EDBA4 /* MMProcessDetailInspector.m */; };
3BA6709B727B1AAC6C4310B5 /* MMProcessDetailsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7187632FF63B3B0D07FE9194 /* MMProcessDetailsTests.swift */; };
3C0AC14F803C813287D8A663 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007F48A5A599AB4E8D216D16 /* IOKit.framework */; };
4419FE7554489B23976E2970 /* MMCPULoadProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = D68FC8100D08DB6202F46339 /* MMCPULoadProvider.m */; };
4C1A92F4DEF4C824976115C2 /* MMNetworkSocketsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374B1BF631CC4738CB52CA3B /* MMNetworkSocketsTests.swift */; };
57BA02AE1CE24DBD02BD03A4 /* MMComponentThermalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B288C7402E2C00E75F8CD016 /* MMComponentThermalTests.swift */; };
5D31906EA986E2BA92E86FA8 /* MMNetworkBandwidthTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27C612287333D757C92A076A /* MMNetworkBandwidthTests.swift */; };
6201FD599FED061F6C736E8B /* MMMemoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 099DCF7EF03A58ADA40A94A1 /* MMMemoryTests.swift */; };
655366D7066478A02EDA91BB /* MMFanTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = C9ED8F75E082D4F8AC2FF2F5 /* MMFanTelemetryProvider.m */; };
6A4FDB46AE5E0DAF85CCAB56 /* MMDiskIOTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9DAC4D5C09C974EE833DC7C /* MMDiskIOTests.swift */; };
6D973241BBE61F0B053239DB /* MMGPUTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = D61AB99733A4AA52459BA7C4 /* MMGPUTelemetryProvider.m */; };
7C9AE2ADAED52E593B52F3AE /* MMProcessTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52471E871E5CC1E444318070 /* MMProcessTests.swift */; };
87818E46CEA5145A8215D0E3 /* MMCPUThermalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F2BD3777A674DC4EB442890 /* MMCPUThermalTests.swift */; };
87A9E18362486D0D385BBC4A /* MMCPUThermalProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 62C377EFD025D6A6B5563E77 /* MMCPUThermalProvider.m */; };
88387CDAE2AC1CC74EF89B57 /* MacMonitorApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADEA6BD38BA8D887B1DB64A9 /* MacMonitorApp.swift */; };
901EF4853E785A2856E54BC9 /* MMKernelTelemetryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE40072F9A1F9DBD1C48A3B1 /* MMKernelTelemetryTests.swift */; };
925245C5B5F8D8DA3C89C4BA /* MMComponentThermalProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = C65F5835516BC2A65BCE25D2 /* MMComponentThermalProvider.m */; };
93EF83FE087C6DEAAE3EC0CC /* MMProcessTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 728C692778909D2B7451C07B /* MMProcessTelemetryProvider.m */; };
951DBA5D3BBAB753322A5DF9 /* MMLoadAverageProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = B5F2256DF514DD737306302B /* MMLoadAverageProvider.m */; };
9B5C651AD2AF7DE2738F0C44 /* MMPowerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D48698681374BD25B980C000 /* MMPowerTests.swift */; };
9BCE74C5454F81EF80492E75 /* MacMonitorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EC3EDFCD5C50CB352FCED87 /* MacMonitorTests.swift */; };
A521961E035DD50ED8B0C1A9 /* MMKernelTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = F444F4543F0A7421C8F8E636 /* MMKernelTelemetryProvider.m */; };
A599E974E56F0B8D94A7E480 /* MMNetworkSocketsProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = D78F76C1996D7FCA241CE532 /* MMNetworkSocketsProvider.m */; };
A7609CE56D49EC3419987468 /* SystemTelemetryStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4B4E94FB2886C60D5548A2A /* SystemTelemetryStore.swift */; };
A9FCAEC0BF27A419DB148C4A /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E142AE61F9B87757997870DD /* ContentView.swift */; };
ACC914C61AB3762EB0C40513 /* MMLoadAverageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EB05C092C94C3972727AAA7 /* MMLoadAverageTests.swift */; };
AE3C28BDC3CEF40A9E8F2B20 /* MMGPUTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80A0F723121CDF9597316F58 /* MMGPUTests.swift */; };
B9C2D6574E808B517BA34C83 /* MMMemoryTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 991AEEAF262F3C6BE930BC77 /* MMMemoryTelemetryProvider.m */; };
CD91FC663B19DA1FEA3D49D7 /* MMAppleSMCClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 5555436CD3CB8A73F5D6504F /* MMAppleSMCClient.m */; };
E3CCE93A7D4D1EB0187D3E52 /* MMNetworkBandwidthProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = C539AEA27C794C6F428EA875 /* MMNetworkBandwidthProvider.m */; };
E6F2F695B8D3E7045967C082 /* MMFanTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336CEE35A745F3C7E9F70F43 /* MMFanTests.swift */; };
EAFAF5A10502D4ACC64F4720 /* MMTelemetryCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = F9F9AD1268F906761032AF4D /* MMTelemetryCoordinator.m */; };
EC9FA3E4A119277B89E73F8D /* MMSMCTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 940D608A1AF80F75584E744E /* MMSMCTests.swift */; };
F2F7A141F2452EC1B4FB45D8 /* MMStorageTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 6DCBCEA450103E2404761B78 /* MMStorageTelemetryProvider.m */; };
FED88F290A2F2FBD63DDEC31 /* MMDiskIOProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E13917CAF525640D856ECD9 /* MMDiskIOProvider.m */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -49,16 +65,26 @@
02F5FDE260999C39E978D849 /* MMPowerTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMPowerTelemetryProvider.m; sourceTree = "<group>"; };
09475741B5D0D4B89B863C3D /* MMComponentThermalProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMComponentThermalProvider.h; sourceTree = "<group>"; };
099DCF7EF03A58ADA40A94A1 /* MMMemoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMMemoryTests.swift; sourceTree = "<group>"; };
0C94CCFBE8C9E1370368A28C /* MMNetworkSocketsProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMNetworkSocketsProvider.h; sourceTree = "<group>"; };
0F2BD3777A674DC4EB442890 /* MMCPUThermalTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMCPUThermalTests.swift; sourceTree = "<group>"; };
1AD9EEE571CD904BBCD1C96B /* MMSMCParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMSMCParser.h; sourceTree = "<group>"; };
1B07A683AD0EFBA8E1FB6C9D /* MMProcessDetailInspector.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMProcessDetailInspector.h; sourceTree = "<group>"; };
2345555FF9780B02A90CC7A9 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
27C612287333D757C92A076A /* MMNetworkBandwidthTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMNetworkBandwidthTests.swift; sourceTree = "<group>"; };
2C55E977DBFBE7FF04621608 /* MMLoadAverageProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMLoadAverageProvider.h; sourceTree = "<group>"; };
2EC3EDFCD5C50CB352FCED87 /* MacMonitorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacMonitorTests.swift; sourceTree = "<group>"; };
32340166F6100A08105308D3 /* MMTelemetryCoordinator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMTelemetryCoordinator.h; sourceTree = "<group>"; };
336CEE35A745F3C7E9F70F43 /* MMFanTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMFanTests.swift; sourceTree = "<group>"; };
374B1BF631CC4738CB52CA3B /* MMNetworkSocketsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMNetworkSocketsTests.swift; sourceTree = "<group>"; };
375AA781A2AA0A20B119C7B7 /* MMSMCParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMSMCParser.m; sourceTree = "<group>"; };
3A14D7B97200EA4C102FEE67 /* MMNetworkBandwidthProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMNetworkBandwidthProvider.h; sourceTree = "<group>"; };
3CFC5B905E428A6B854E0AB4 /* MMFanTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMFanTelemetryProvider.h; sourceTree = "<group>"; };
3E13917CAF525640D856ECD9 /* MMDiskIOProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMDiskIOProvider.m; sourceTree = "<group>"; };
41478843A6B013478D94F739 /* MMProcessTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMProcessTelemetryProvider.h; sourceTree = "<group>"; };
46DE3AE12DAE26C4FE58034C /* MMStorageTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMStorageTelemetryProvider.h; sourceTree = "<group>"; };
4CE92B1A8D7FDBB6499448E1 /* MMCPULoadTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMCPULoadTests.swift; sourceTree = "<group>"; };
52471E871E5CC1E444318070 /* MMProcessTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMProcessTests.swift; sourceTree = "<group>"; };
52E641F8A664D456518EDBA4 /* MMProcessDetailInspector.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMProcessDetailInspector.m; sourceTree = "<group>"; };
5555436CD3CB8A73F5D6504F /* MMAppleSMCClient.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMAppleSMCClient.m; sourceTree = "<group>"; };
5635101F862DE680856BDE6E /* MMTelemetryDomain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMTelemetryDomain.h; sourceTree = "<group>"; };
56E285A0A1746AE659981F22 /* MacMonitorTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MacMonitorTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -66,21 +92,35 @@
62C377EFD025D6A6B5563E77 /* MMCPUThermalProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMCPUThermalProvider.m; sourceTree = "<group>"; };
6D0E5CAF25DFA9A1D2A698A0 /* MMTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMTelemetryProvider.h; sourceTree = "<group>"; };
6DCBCEA450103E2404761B78 /* MMStorageTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMStorageTelemetryProvider.m; sourceTree = "<group>"; };
7187632FF63B3B0D07FE9194 /* MMProcessDetailsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMProcessDetailsTests.swift; sourceTree = "<group>"; };
726005CB5A6C86E7D80D3CA0 /* MMAppleSMCClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMAppleSMCClient.h; sourceTree = "<group>"; };
728C692778909D2B7451C07B /* MMProcessTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMProcessTelemetryProvider.m; sourceTree = "<group>"; };
78325870C7CD8312AECA2236 /* MMStorageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMStorageTests.swift; sourceTree = "<group>"; };
7EB05C092C94C3972727AAA7 /* MMLoadAverageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMLoadAverageTests.swift; sourceTree = "<group>"; };
80A0F723121CDF9597316F58 /* MMGPUTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMGPUTests.swift; sourceTree = "<group>"; };
8FBB436F3D9472194D8C6EDD /* MMSMCDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMSMCDefines.h; sourceTree = "<group>"; };
940D608A1AF80F75584E744E /* MMSMCTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMSMCTests.swift; sourceTree = "<group>"; };
991AEEAF262F3C6BE930BC77 /* MMMemoryTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMMemoryTelemetryProvider.m; sourceTree = "<group>"; };
9DC54CCE276F93D5AF0A0C28 /* MMGPUTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMGPUTelemetryProvider.h; sourceTree = "<group>"; };
ADEA6BD38BA8D887B1DB64A9 /* MacMonitorApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacMonitorApp.swift; sourceTree = "<group>"; };
AFA681E2464EA78CC19B54E0 /* MMDiskIOProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMDiskIOProvider.h; sourceTree = "<group>"; };
B288C7402E2C00E75F8CD016 /* MMComponentThermalTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMComponentThermalTests.swift; sourceTree = "<group>"; };
B5F2256DF514DD737306302B /* MMLoadAverageProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMLoadAverageProvider.m; sourceTree = "<group>"; };
C539AEA27C794C6F428EA875 /* MMNetworkBandwidthProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMNetworkBandwidthProvider.m; sourceTree = "<group>"; };
C65F5835516BC2A65BCE25D2 /* MMComponentThermalProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMComponentThermalProvider.m; sourceTree = "<group>"; };
C9ED8F75E082D4F8AC2FF2F5 /* MMFanTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMFanTelemetryProvider.m; sourceTree = "<group>"; };
CBA91906CA8B7936CC82A36B /* MMPowerTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMPowerTelemetryProvider.h; sourceTree = "<group>"; };
D48698681374BD25B980C000 /* MMPowerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMPowerTests.swift; sourceTree = "<group>"; };
D61AB99733A4AA52459BA7C4 /* MMGPUTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMGPUTelemetryProvider.m; sourceTree = "<group>"; };
D68FC8100D08DB6202F46339 /* MMCPULoadProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMCPULoadProvider.m; sourceTree = "<group>"; };
D73CCC7B5E6BF1825EA68E2B /* MMCPUThermalProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMCPUThermalProvider.h; sourceTree = "<group>"; };
D78F76C1996D7FCA241CE532 /* MMNetworkSocketsProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMNetworkSocketsProvider.m; sourceTree = "<group>"; };
DE40072F9A1F9DBD1C48A3B1 /* MMKernelTelemetryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMKernelTelemetryTests.swift; sourceTree = "<group>"; };
E142AE61F9B87757997870DD /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
E4B4E94FB2886C60D5548A2A /* SystemTelemetryStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemTelemetryStore.swift; sourceTree = "<group>"; };
E6D9BB71DFE7384D0F0E6AA3 /* MMKernelTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMKernelTelemetryProvider.h; sourceTree = "<group>"; };
E9DAC4D5C09C974EE833DC7C /* MMDiskIOTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMDiskIOTests.swift; sourceTree = "<group>"; };
F444F4543F0A7421C8F8E636 /* MMKernelTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMKernelTelemetryProvider.m; sourceTree = "<group>"; };
F5EC59DCDA5FABDA409CDBCB /* MacMonitor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacMonitor.app; sourceTree = BUILT_PRODUCTS_DIR; };
F9F9AD1268F906761032AF4D /* MMTelemetryCoordinator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMTelemetryCoordinator.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -157,6 +197,17 @@
path = CPU;
sourceTree = "<group>";
};
8719744C366432DD7C2B9644 /* Process */ = {
isa = PBXGroup;
children = (
1B07A683AD0EFBA8E1FB6C9D /* MMProcessDetailInspector.h */,
52E641F8A664D456518EDBA4 /* MMProcessDetailInspector.m */,
41478843A6B013478D94F739 /* MMProcessTelemetryProvider.h */,
728C692778909D2B7451C07B /* MMProcessTelemetryProvider.m */,
);
path = Process;
sourceTree = "<group>";
};
8B31CE7F9319FEC373E6CDC6 /* Power */ = {
isa = PBXGroup;
children = (
@@ -171,14 +222,30 @@
children = (
78383CED205BCA772701AE48 /* CPU */,
AD2995435E44FA3E1790A4F3 /* Fan */,
F99AF003017BA9F19F7AEB1E /* GPU */,
CA2F30473D63EC64CBD65437 /* Kernel */,
EE2F5EFC9DC33CEDA79A131F /* Memory */,
901D54FEAB6E9D6E787E599D /* Network */,
8B31CE7F9319FEC373E6CDC6 /* Power */,
8719744C366432DD7C2B9644 /* Process */,
B6EB3F6545276C40212C2992 /* Storage */,
A8658D19E71E34F1DDD87097 /* System */,
DBDC37231C01F0A2D4A7FC73 /* Thermal */,
);
path = Telemetry;
sourceTree = "<group>";
};
901D54FEAB6E9D6E787E599D /* Network */ = {
isa = PBXGroup;
children = (
3A14D7B97200EA4C102FEE67 /* MMNetworkBandwidthProvider.h */,
C539AEA27C794C6F428EA875 /* MMNetworkBandwidthProvider.m */,
0C94CCFBE8C9E1370368A28C /* MMNetworkSocketsProvider.h */,
D78F76C1996D7FCA241CE532 /* MMNetworkSocketsProvider.m */,
);
path = Network;
sourceTree = "<group>";
};
9844EC526E3527F6A582179F /* Hardware */ = {
isa = PBXGroup;
children = (
@@ -187,6 +254,15 @@
path = Hardware;
sourceTree = "<group>";
};
A8658D19E71E34F1DDD87097 /* System */ = {
isa = PBXGroup;
children = (
2C55E977DBFBE7FF04621608 /* MMLoadAverageProvider.h */,
B5F2256DF514DD737306302B /* MMLoadAverageProvider.m */,
);
path = System;
sourceTree = "<group>";
};
AD2995435E44FA3E1790A4F3 /* Fan */ = {
isa = PBXGroup;
children = (
@@ -199,6 +275,8 @@
B6EB3F6545276C40212C2992 /* Storage */ = {
isa = PBXGroup;
children = (
AFA681E2464EA78CC19B54E0 /* MMDiskIOProvider.h */,
3E13917CAF525640D856ECD9 /* MMDiskIOProvider.m */,
46DE3AE12DAE26C4FE58034C /* MMStorageTelemetryProvider.h */,
6DCBCEA450103E2404761B78 /* MMStorageTelemetryProvider.m */,
);
@@ -221,15 +299,32 @@
B288C7402E2C00E75F8CD016 /* MMComponentThermalTests.swift */,
4CE92B1A8D7FDBB6499448E1 /* MMCPULoadTests.swift */,
0F2BD3777A674DC4EB442890 /* MMCPUThermalTests.swift */,
E9DAC4D5C09C974EE833DC7C /* MMDiskIOTests.swift */,
336CEE35A745F3C7E9F70F43 /* MMFanTests.swift */,
80A0F723121CDF9597316F58 /* MMGPUTests.swift */,
DE40072F9A1F9DBD1C48A3B1 /* MMKernelTelemetryTests.swift */,
7EB05C092C94C3972727AAA7 /* MMLoadAverageTests.swift */,
099DCF7EF03A58ADA40A94A1 /* MMMemoryTests.swift */,
27C612287333D757C92A076A /* MMNetworkBandwidthTests.swift */,
374B1BF631CC4738CB52CA3B /* MMNetworkSocketsTests.swift */,
D48698681374BD25B980C000 /* MMPowerTests.swift */,
7187632FF63B3B0D07FE9194 /* MMProcessDetailsTests.swift */,
52471E871E5CC1E444318070 /* MMProcessTests.swift */,
940D608A1AF80F75584E744E /* MMSMCTests.swift */,
78325870C7CD8312AECA2236 /* MMStorageTests.swift */,
);
path = Tests;
sourceTree = "<group>";
};
CA2F30473D63EC64CBD65437 /* Kernel */ = {
isa = PBXGroup;
children = (
E6D9BB71DFE7384D0F0E6AA3 /* MMKernelTelemetryProvider.h */,
F444F4543F0A7421C8F8E636 /* MMKernelTelemetryProvider.m */,
);
path = Kernel;
sourceTree = "<group>";
};
DBDC37231C01F0A2D4A7FC73 /* Thermal */ = {
isa = PBXGroup;
children = (
@@ -271,6 +366,15 @@
path = Memory;
sourceTree = "<group>";
};
F99AF003017BA9F19F7AEB1E /* GPU */ = {
isa = PBXGroup;
children = (
9DC54CCE276F93D5AF0A0C28 /* MMGPUTelemetryProvider.h */,
D61AB99733A4AA52459BA7C4 /* MMGPUTelemetryProvider.m */,
);
path = GPU;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -349,9 +453,17 @@
160334CC765E091A7CBE21AA /* MMCPULoadTests.swift in Sources */,
87818E46CEA5145A8215D0E3 /* MMCPUThermalTests.swift in Sources */,
57BA02AE1CE24DBD02BD03A4 /* MMComponentThermalTests.swift in Sources */,
6A4FDB46AE5E0DAF85CCAB56 /* MMDiskIOTests.swift in Sources */,
E6F2F695B8D3E7045967C082 /* MMFanTests.swift in Sources */,
AE3C28BDC3CEF40A9E8F2B20 /* MMGPUTests.swift in Sources */,
901EF4853E785A2856E54BC9 /* MMKernelTelemetryTests.swift in Sources */,
ACC914C61AB3762EB0C40513 /* MMLoadAverageTests.swift in Sources */,
6201FD599FED061F6C736E8B /* MMMemoryTests.swift in Sources */,
5D31906EA986E2BA92E86FA8 /* MMNetworkBandwidthTests.swift in Sources */,
4C1A92F4DEF4C824976115C2 /* MMNetworkSocketsTests.swift in Sources */,
9B5C651AD2AF7DE2738F0C44 /* MMPowerTests.swift in Sources */,
3BA6709B727B1AAC6C4310B5 /* MMProcessDetailsTests.swift in Sources */,
7C9AE2ADAED52E593B52F3AE /* MMProcessTests.swift in Sources */,
EC9FA3E4A119277B89E73F8D /* MMSMCTests.swift in Sources */,
1B15F48F6B19E9EA4556ECD5 /* MMStorageTests.swift in Sources */,
9BCE74C5454F81EF80492E75 /* MacMonitorTests.swift in Sources */,
@@ -367,9 +479,17 @@
4419FE7554489B23976E2970 /* MMCPULoadProvider.m in Sources */,
87A9E18362486D0D385BBC4A /* MMCPUThermalProvider.m in Sources */,
925245C5B5F8D8DA3C89C4BA /* MMComponentThermalProvider.m in Sources */,
FED88F290A2F2FBD63DDEC31 /* MMDiskIOProvider.m in Sources */,
655366D7066478A02EDA91BB /* MMFanTelemetryProvider.m in Sources */,
6D973241BBE61F0B053239DB /* MMGPUTelemetryProvider.m in Sources */,
A521961E035DD50ED8B0C1A9 /* MMKernelTelemetryProvider.m in Sources */,
951DBA5D3BBAB753322A5DF9 /* MMLoadAverageProvider.m in Sources */,
B9C2D6574E808B517BA34C83 /* MMMemoryTelemetryProvider.m in Sources */,
E3CCE93A7D4D1EB0187D3E52 /* MMNetworkBandwidthProvider.m in Sources */,
A599E974E56F0B8D94A7E480 /* MMNetworkSocketsProvider.m in Sources */,
0A7117B3B7CC7112F2527574 /* MMPowerTelemetryProvider.m in Sources */,
2C0F7AB93691ED8AA86FBCF0 /* MMProcessDetailInspector.m in Sources */,
93EF83FE087C6DEAAE3EC0CC /* MMProcessTelemetryProvider.m in Sources */,
1B3F1C8ABF0ADFAA290FF6F6 /* MMSMCParser.m in Sources */,
F2F7A141F2452EC1B4FB45D8 /* MMStorageTelemetryProvider.m in Sources */,
EAFAF5A10502D4ACC64F4720 /* MMTelemetryCoordinator.m in Sources */,
@@ -26,5 +26,6 @@
#import "MMNetworkSocketsProvider.h"
#import "MMProcessTelemetryProvider.h"
#import "MMProcessDetailInspector.h"
#import "MMGPUTelemetryProvider.h"
#endif /* MacMonitor_Bridging_Header_h */
@@ -0,0 +1,31 @@
#ifndef MMGPUTelemetryProvider_h
#define MMGPUTelemetryProvider_h
#import <Foundation/Foundation.h>
#import "MMTelemetryProvider.h"
#import "MMAppleSMCClient.h"
NS_ASSUME_NONNULL_BEGIN
/**
* MMGPUTelemetryProvider
* Samples Intel Integrated Graphics (Iris/UHD) and AMD Discrete Graphics (Radeon/Vega)
* utilization, VRAM allocation, and thermal metrics via IOKit and Metal.
*/
@interface MMGPUTelemetryProvider : NSObject <MMTelemetryProvider>
@property (nonatomic, strong, readonly) MMAppleSMCClient *smcClient;
- (instancetype)init;
- (instancetype)initWithSMCClient:(MMAppleSMCClient *)client;
/**
* Pure calculator method for deterministic unit testing.
*/
+ (NSDictionary<NSString *, id> *)calculateGPUMetricsWithDevices:(NSArray<NSDictionary<NSString *, id> *> *)gpuDevices;
@end
NS_ASSUME_NONNULL_END
#endif /* MMGPUTelemetryProvider_h */
@@ -0,0 +1,184 @@
#import "MMGPUTelemetryProvider.h"
#import <IOKit/IOKitLib.h>
#import <Metal/Metal.h>
@interface MMGPUTelemetryProvider () {
MMAppleSMCClient *_smcClient;
}
@end
@implementation MMGPUTelemetryProvider
- (instancetype)init {
return [self initWithSMCClient:[MMAppleSMCClient sharedClient]];
}
- (instancetype)initWithSMCClient:(MMAppleSMCClient *)client {
self = [super init];
if (self) {
_smcClient = client;
}
return self;
}
- (MMTelemetryDomain)domain {
return MMTelemetryDomainGPU;
}
- (NSString *)providerIdentifier {
return @"com.i3omb.macmonitor.telemetry.gpu";
}
- (BOOL)isAvailable {
return YES;
}
- (MMAppleSMCClient *)smcClient {
return _smcClient;
}
+ (NSDictionary<NSString *, id> *)calculateGPUMetricsWithDevices:(NSArray<NSDictionary<NSString *, id> *> *)gpuDevices {
double totalUtil = 0.0;
double peakUtil = 0.0;
NSString *activeGPU = @"None";
for (NSDictionary<NSString *, id> *gpu in gpuDevices) {
double util = [gpu[@"utilization"] doubleValue];
totalUtil += util;
if (util > peakUtil) {
peakUtil = util;
activeGPU = gpu[@"name"] ?: @"GPU";
}
}
double avgUtil = gpuDevices.count > 0 ? (totalUtil / (double)gpuDevices.count) : 0.0;
if ([activeGPU isEqualToString:@"None"] && gpuDevices.count > 0) {
activeGPU = gpuDevices[0][@"name"] ?: @"GPU";
}
return @{
@"gpuCount": @(gpuDevices.count),
@"averageUtilization": @(avgUtil),
@"peakUtilization": @(peakUtil),
@"activeGPUName": activeGPU,
@"devices": gpuDevices
};
}
- (nullable NSDictionary<NSString *, id> *)sampleTelemetryWithError:(NSError **)error {
// 1. Query IOKit IOAccelerator performance statistics
NSMutableDictionary<NSString *, NSDictionary *> *accelStatsByName = [NSMutableDictionary dictionary];
CFMutableDictionaryRef matching = IOServiceMatching("IOAccelerator");
io_iterator_t iterator = IO_OBJECT_NULL;
if (IOServiceGetMatchingServices(kIOMainPortDefault, matching, &iterator) == KERN_SUCCESS && iterator != IO_OBJECT_NULL) {
io_registry_entry_t entry;
while ((entry = IOIteratorNext(iterator)) != IO_OBJECT_NULL) {
CFMutableDictionaryRef props = NULL;
if (IORegistryEntryCreateCFProperties(entry, &props, kCFAllocatorDefault, 0) == KERN_SUCCESS && props) {
NSDictionary *dict = (__bridge NSDictionary *)props;
NSDictionary *stats = dict[@"PerformanceStatistics"];
io_name_t entryName;
if (IORegistryEntryGetName(entry, entryName) == KERN_SUCCESS && stats) {
accelStatsByName[[NSString stringWithUTF8String:entryName]] = stats;
}
CFRelease(props);
}
IOObjectRelease(entry);
}
IOObjectRelease(iterator);
}
// 2. Query SMC for GPU temperature fallback
NSNumber *smcGpuTemp = nil;
if (_smcClient.isAvailable) {
smcGpuTemp = [_smcClient readNumericValueForKey:@"TG0D" error:nil];
if (!smcGpuTemp) {
smcGpuTemp = [_smcClient readNumericValueForKey:@"TG0P" error:nil];
}
}
// 3. Enumerate Metal devices
NSArray<id<MTLDevice>> *metalDevices = MTLCopyAllDevices();
NSMutableArray<NSDictionary<NSString *, id> *> *deviceList = [NSMutableArray array];
for (id<MTLDevice> dev in metalDevices) {
NSString *name = dev.name;
BOOL isLowPower = dev.isLowPower;
BOOL isRemovable = dev.isRemovable;
uint64_t maxMem = dev.recommendedMaxWorkingSetSize;
// Find matching stats
double util = 0.0;
uint64_t vramUsed = 0;
uint64_t vramTotal = maxMem;
double temp = smcGpuTemp ? [smcGpuTemp doubleValue] : 0.0;
for (NSString *accelName in accelStatsByName) {
NSDictionary *stats = accelStatsByName[accelName];
// Check Intel stats
if ([name containsString:@"Intel"] || [accelName containsString:@"Intel"]) {
if (stats[@"Device Utilization %"]) {
util = [stats[@"Device Utilization %"] doubleValue];
}
if (stats[@"gartUsedBytes"]) {
vramUsed = [stats[@"gartUsedBytes"] unsignedLongLongValue];
}
if (stats[@"gartSizeBytes"]) {
vramTotal = [stats[@"gartSizeBytes"] unsignedLongLongValue];
}
} else {
// AMD / Discrete stats
if (stats[@"GPU Activity(%)"]) {
util = [stats[@"GPU Activity(%)"] doubleValue];
} else if (stats[@"Device Utilization %"]) {
util = [stats[@"Device Utilization %"] doubleValue];
}
if (stats[@"vramUsedBytes"]) {
vramUsed = [stats[@"vramUsedBytes"] unsignedLongLongValue];
}
if (stats[@"vramFreeBytes"]) {
uint64_t freeBytes = [stats[@"vramFreeBytes"] unsignedLongLongValue];
vramTotal = vramUsed + freeBytes;
}
if (stats[@"Temperature(C)"]) {
temp = [stats[@"Temperature(C)"] doubleValue];
}
}
}
NSString *gpuType = isLowPower || [name containsString:@"Intel"] ? @"Integrated" : @"Discrete";
[deviceList addObject:@{
@"name": name,
@"type": gpuType,
@"utilization": @(util),
@"vramUsedBytes": @(vramUsed),
@"vramTotalBytes": @(vramTotal),
@"temperature": @(temp),
@"isLowPower": @(isLowPower),
@"isRemovable": @(isRemovable),
@"recommendedMaxWorkingSetBytes": @(maxMem)
}];
}
// Fallback if no Metal devices enumerated (headless / virtualization)
if (deviceList.count == 0) {
[deviceList addObject:@{
@"name": @"Default GPU",
@"type": @"Integrated",
@"utilization": @(0.0),
@"vramUsedBytes": @(0),
@"vramTotalBytes": @(1024 * 1024 * 1024),
@"temperature": @(0.0),
@"isLowPower": @(YES),
@"isRemovable": @(NO),
@"recommendedMaxWorkingSetBytes": @(1024 * 1024 * 1024)
}];
}
return [MMGPUTelemetryProvider calculateGPUMetricsWithDevices:deviceList];
}
@end
+54
View File
@@ -0,0 +1,54 @@
import XCTest
@testable import MacMonitor
final class MMGPUTests: XCTestCase {
func testGPUMetricsCalculation() {
let mockGPUs: [[String: Any]] = [
[
"name": "Intel Iris Plus Graphics 655",
"type": "Integrated",
"utilization": 15.0,
"vramUsedBytes": 500_000_000,
"vramTotalBytes": 1_500_000_000,
"temperature": 45.0,
"isLowPower": true,
"isRemovable": false
],
[
"name": "AMD Radeon Pro 560X",
"type": "Discrete",
"utilization": 75.0,
"vramUsedBytes": 3_000_000_000,
"vramTotalBytes": 4_000_000_000,
"temperature": 68.0,
"isLowPower": false,
"isRemovable": false
]
]
let metrics = MMGPUTelemetryProvider.calculateGPUMetrics(withDevices: mockGPUs)
let count = metrics["gpuCount"] as? Int ?? 0
let avg = metrics["averageUtilization"] as? Double ?? 0
let peak = metrics["peakUtilization"] as? Double ?? 0
let active = metrics["activeGPUName"] as? String ?? ""
XCTAssertEqual(count, 2)
XCTAssertEqual(avg, 45.0, accuracy: 0.1)
XCTAssertEqual(peak, 75.0, accuracy: 0.1)
XCTAssertEqual(active, "AMD Radeon Pro 560X")
}
func testLiveGPUProvider() throws {
let provider = MMGPUTelemetryProvider()
XCTAssertEqual(provider.domain, .gpu)
XCTAssertEqual(provider.providerIdentifier, "com.i3omb.macmonitor.telemetry.gpu")
let sample = try provider.sampleTelemetry()
XCTAssertNotNil(sample)
XCTAssertNotNil(sample["gpuCount"])
XCTAssertNotNil(sample["devices"])
XCTAssertNotNil(sample["activeGPUName"])
}
}