Compare commits
17
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 gronod
|
91d50dcbae | ||
|
gronod
|
36c7ea2319 | ||
|
gronod
|
fda8bf9e49 | ||
|
gronod
|
feceb2412d | ||
|
gronod
|
f9093b1d99 | ||
|
gronod
|
a14f0b925e | ||
|
gronod
|
b47ffd72ca | ||
|
gronod
|
c2fa0c05ed | ||
|
gronod
|
67bfa9f681 | ||
|
gronod
|
4973a67ca9 | ||
|
gronod
|
3e8852258a | ||
|
gronod
|
b37cfb06a9 | ||
|
gronod
|
cb625964a5 | ||
|
gronod
|
5517e92eff | ||
|
gronod
|
f03477181b | ||
|
gronod
|
ad2695aa4e | ||
|
gronod
|
a274927c2f |
@@ -0,0 +1,84 @@
|
||||
name: MacMonitor CI/CD Pipeline
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- develop
|
||||
- 'milestone/**'
|
||||
- 'feat/**'
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
- develop
|
||||
- 'milestone/**'
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
build-and-test:
|
||||
name: Build & Test (Intel x86_64)
|
||||
runs-on: [macos, intel]
|
||||
|
||||
steps:
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Inspect Toolchain & Environment
|
||||
run: |
|
||||
echo "=== Host Architecture ==="
|
||||
uname -m
|
||||
echo "=== macOS Version ==="
|
||||
sw_vers
|
||||
echo "=== Active Xcode Version ==="
|
||||
xcodebuild -version
|
||||
echo "=== Available macOS SDKs ==="
|
||||
xcrun --show-sdk-path
|
||||
|
||||
- name: Generate Xcode Project
|
||||
run: |
|
||||
if command -v xcodegen &> /dev/null; then
|
||||
xcodegen generate
|
||||
else
|
||||
echo "xcodegen not preinstalled, using tracked MacMonitor.xcodeproj"
|
||||
fi
|
||||
|
||||
- name: Run SwiftLint Linting
|
||||
run: |
|
||||
if command -v swiftlint &> /dev/null; then
|
||||
swiftlint lint --reporter emoji
|
||||
else
|
||||
echo "swiftlint not found, skipping lint step"
|
||||
fi
|
||||
|
||||
- name: Build MacMonitor Scheme
|
||||
run: |
|
||||
set -o pipefail
|
||||
if command -v xcbeautify &> /dev/null; then
|
||||
xcodebuild clean build \
|
||||
-scheme MacMonitor \
|
||||
-destination 'generic/platform=macOS,arch=x86_64' \
|
||||
CODE_SIGNING_ALLOWED=NO | xcbeautify
|
||||
else
|
||||
xcodebuild clean build \
|
||||
-scheme MacMonitor \
|
||||
-destination 'generic/platform=macOS,arch=x86_64' \
|
||||
CODE_SIGNING_ALLOWED=NO
|
||||
fi
|
||||
|
||||
- name: Run Unit Tests
|
||||
run: |
|
||||
set -o pipefail
|
||||
if command -v xcbeautify &> /dev/null; then
|
||||
xcodebuild test \
|
||||
-scheme MacMonitor \
|
||||
-destination 'platform=macOS,arch=x86_64' \
|
||||
CODE_SIGNING_ALLOWED=NO | xcbeautify
|
||||
else
|
||||
xcodebuild test \
|
||||
-scheme MacMonitor \
|
||||
-destination 'platform=macOS,arch=x86_64' \
|
||||
CODE_SIGNING_ALLOWED=NO
|
||||
fi
|
||||
@@ -7,16 +7,26 @@
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
160334CC765E091A7CBE21AA /* MMCPULoadTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE92B1A8D7FDBB6499448E1 /* MMCPULoadTests.swift */; };
|
||||
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 */; };
|
||||
3C0AC14F803C813287D8A663 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007F48A5A599AB4E8D216D16 /* IOKit.framework */; };
|
||||
4419FE7554489B23976E2970 /* MMCPULoadProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = D68FC8100D08DB6202F46339 /* MMCPULoadProvider.m */; };
|
||||
6201FD599FED061F6C736E8B /* MMMemoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 099DCF7EF03A58ADA40A94A1 /* MMMemoryTests.swift */; };
|
||||
655366D7066478A02EDA91BB /* MMFanTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = C9ED8F75E082D4F8AC2FF2F5 /* MMFanTelemetryProvider.m */; };
|
||||
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 */; };
|
||||
9BCE74C5454F81EF80492E75 /* MacMonitorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EC3EDFCD5C50CB352FCED87 /* MacMonitorTests.swift */; };
|
||||
A7609CE56D49EC3419987468 /* SystemTelemetryStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4B4E94FB2886C60D5548A2A /* SystemTelemetryStore.swift */; };
|
||||
A9FCAEC0BF27A419DB148C4A /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E142AE61F9B87757997870DD /* ContentView.swift */; };
|
||||
B9C2D6574E808B517BA34C83 /* MMMemoryTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 991AEEAF262F3C6BE930BC77 /* MMMemoryTelemetryProvider.m */; };
|
||||
CD91FC663B19DA1FEA3D49D7 /* MMAppleSMCClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 5555436CD3CB8A73F5D6504F /* MMAppleSMCClient.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 */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
@@ -31,19 +41,34 @@
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
007F48A5A599AB4E8D216D16 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
|
||||
0130BD1E18972DF9E2955334 /* MMMemoryTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMMemoryTelemetryProvider.h; sourceTree = "<group>"; };
|
||||
099DCF7EF03A58ADA40A94A1 /* MMMemoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMMemoryTests.swift; 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>"; };
|
||||
2345555FF9780B02A90CC7A9 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
|
||||
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>"; };
|
||||
375AA781A2AA0A20B119C7B7 /* MMSMCParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMSMCParser.m; sourceTree = "<group>"; };
|
||||
3CFC5B905E428A6B854E0AB4 /* MMFanTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMFanTelemetryProvider.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>"; };
|
||||
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; };
|
||||
57845310A3D4EC67E48A3B11 /* MMCPULoadProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMCPULoadProvider.h; sourceTree = "<group>"; };
|
||||
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>"; };
|
||||
726005CB5A6C86E7D80D3CA0 /* MMAppleSMCClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMAppleSMCClient.h; sourceTree = "<group>"; };
|
||||
78325870C7CD8312AECA2236 /* MMStorageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMStorageTests.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>"; };
|
||||
ADEA6BD38BA8D887B1DB64A9 /* MacMonitorApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacMonitorApp.swift; sourceTree = "<group>"; };
|
||||
C9ED8F75E082D4F8AC2FF2F5 /* MMFanTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMFanTelemetryProvider.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>"; };
|
||||
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>"; };
|
||||
F5EC59DCDA5FABDA409CDBCB /* MacMonitor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacMonitor.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
@@ -79,6 +104,7 @@
|
||||
4D8D8B40632C525CBC1D0E43 /* App */,
|
||||
54787E6270EA7B9A1BE11359 /* Core */,
|
||||
9844EC526E3527F6A582179F /* Hardware */,
|
||||
8BF79E3BCB76E7A1669DC930 /* Telemetry */,
|
||||
3E4A0B53C583BD0B7A68EACE /* UI */,
|
||||
);
|
||||
path = Sources;
|
||||
@@ -112,6 +138,27 @@
|
||||
path = Core;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
78383CED205BCA772701AE48 /* CPU */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
57845310A3D4EC67E48A3B11 /* MMCPULoadProvider.h */,
|
||||
D68FC8100D08DB6202F46339 /* MMCPULoadProvider.m */,
|
||||
);
|
||||
path = CPU;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
8BF79E3BCB76E7A1669DC930 /* Telemetry */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
78383CED205BCA772701AE48 /* CPU */,
|
||||
AD2995435E44FA3E1790A4F3 /* Fan */,
|
||||
EE2F5EFC9DC33CEDA79A131F /* Memory */,
|
||||
B6EB3F6545276C40212C2992 /* Storage */,
|
||||
DBDC37231C01F0A2D4A7FC73 /* Thermal */,
|
||||
);
|
||||
path = Telemetry;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
9844EC526E3527F6A582179F /* Hardware */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@@ -120,6 +167,24 @@
|
||||
path = Hardware;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
AD2995435E44FA3E1790A4F3 /* Fan */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
3CFC5B905E428A6B854E0AB4 /* MMFanTelemetryProvider.h */,
|
||||
C9ED8F75E082D4F8AC2FF2F5 /* MMFanTelemetryProvider.m */,
|
||||
);
|
||||
path = Fan;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6EB3F6545276C40212C2992 /* Storage */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
46DE3AE12DAE26C4FE58034C /* MMStorageTelemetryProvider.h */,
|
||||
6DCBCEA450103E2404761B78 /* MMStorageTelemetryProvider.m */,
|
||||
);
|
||||
path = Storage;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
C80C3EEE8F912F4B214102E3 /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@@ -133,11 +198,25 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
2EC3EDFCD5C50CB352FCED87 /* MacMonitorTests.swift */,
|
||||
4CE92B1A8D7FDBB6499448E1 /* MMCPULoadTests.swift */,
|
||||
0F2BD3777A674DC4EB442890 /* MMCPUThermalTests.swift */,
|
||||
336CEE35A745F3C7E9F70F43 /* MMFanTests.swift */,
|
||||
099DCF7EF03A58ADA40A94A1 /* MMMemoryTests.swift */,
|
||||
940D608A1AF80F75584E744E /* MMSMCTests.swift */,
|
||||
78325870C7CD8312AECA2236 /* MMStorageTests.swift */,
|
||||
);
|
||||
path = Tests;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
DBDC37231C01F0A2D4A7FC73 /* Thermal */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
D73CCC7B5E6BF1825EA68E2B /* MMCPUThermalProvider.h */,
|
||||
62C377EFD025D6A6B5563E77 /* MMCPUThermalProvider.m */,
|
||||
);
|
||||
path = Thermal;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
E012FBB26EF9E35A2FAF87E2 /* AppleSMC */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@@ -159,6 +238,15 @@
|
||||
name = Frameworks;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
EE2F5EFC9DC33CEDA79A131F /* Memory */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
0130BD1E18972DF9E2955334 /* MMMemoryTelemetryProvider.h */,
|
||||
991AEEAF262F3C6BE930BC77 /* MMMemoryTelemetryProvider.m */,
|
||||
);
|
||||
path = Memory;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
@@ -234,7 +322,12 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
160334CC765E091A7CBE21AA /* MMCPULoadTests.swift in Sources */,
|
||||
87818E46CEA5145A8215D0E3 /* MMCPUThermalTests.swift in Sources */,
|
||||
E6F2F695B8D3E7045967C082 /* MMFanTests.swift in Sources */,
|
||||
6201FD599FED061F6C736E8B /* MMMemoryTests.swift in Sources */,
|
||||
EC9FA3E4A119277B89E73F8D /* MMSMCTests.swift in Sources */,
|
||||
1B15F48F6B19E9EA4556ECD5 /* MMStorageTests.swift in Sources */,
|
||||
9BCE74C5454F81EF80492E75 /* MacMonitorTests.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@@ -245,7 +338,12 @@
|
||||
files = (
|
||||
A9FCAEC0BF27A419DB148C4A /* ContentView.swift in Sources */,
|
||||
CD91FC663B19DA1FEA3D49D7 /* MMAppleSMCClient.m in Sources */,
|
||||
4419FE7554489B23976E2970 /* MMCPULoadProvider.m in Sources */,
|
||||
87A9E18362486D0D385BBC4A /* MMCPUThermalProvider.m in Sources */,
|
||||
655366D7066478A02EDA91BB /* MMFanTelemetryProvider.m in Sources */,
|
||||
B9C2D6574E808B517BA34C83 /* MMMemoryTelemetryProvider.m in Sources */,
|
||||
1B3F1C8ABF0ADFAA290FF6F6 /* MMSMCParser.m in Sources */,
|
||||
F2F7A141F2452EC1B4FB45D8 /* MMStorageTelemetryProvider.m in Sources */,
|
||||
EAFAF5A10502D4ACC64F4720 /* MMTelemetryCoordinator.m in Sources */,
|
||||
88387CDAE2AC1CC74EF89B57 /* MacMonitorApp.swift in Sources */,
|
||||
A7609CE56D49EC3419987468 /* SystemTelemetryStore.swift in Sources */,
|
||||
|
||||
@@ -11,4 +11,13 @@
|
||||
#import "MMSMCParser.h"
|
||||
#import "MMAppleSMCClient.h"
|
||||
|
||||
// Telemetry Providers
|
||||
#import "MMCPULoadProvider.h"
|
||||
#import "MMMemoryTelemetryProvider.h"
|
||||
#import "MMStorageTelemetryProvider.h"
|
||||
#import "MMCPUThermalProvider.h"
|
||||
#import "MMFanTelemetryProvider.h"
|
||||
#import "MMComponentThermalProvider.h"
|
||||
#import "MMPowerTelemetryProvider.h"
|
||||
|
||||
#endif /* MacMonitor_Bridging_Header_h */
|
||||
|
||||
@@ -40,6 +40,13 @@
|
||||
(uint32_t)bytes[3];
|
||||
}
|
||||
|
||||
static int hexDigitValue(unichar c) {
|
||||
if (c >= '0' && c <= '9') return c - '0';
|
||||
if (c >= 'a' && c <= 'f') return c - 'a' + 10;
|
||||
if (c >= 'A' && c <= 'F') return c - 'A' + 10;
|
||||
return -1;
|
||||
}
|
||||
|
||||
+ (nullable NSNumber *)decodeValueWithDataType:(NSString *)dataType bytes:(const uint8_t *)bytes size:(NSUInteger)size {
|
||||
if (!bytes || size == 0) return nil;
|
||||
|
||||
@@ -49,7 +56,7 @@
|
||||
if (size >= 2) return @([self decodeSP78:bytes]);
|
||||
} else if ([trimmedType isEqualToString:@"fpe2"]) {
|
||||
if (size >= 2) return @([self decodeFPE2:bytes]);
|
||||
} else if ([trimmedType isEqualToString:@"flt"]) {
|
||||
} else if ([trimmedType isEqualToString:@"flt"] || [trimmedType isEqualToString:@"ioft"]) {
|
||||
if (size >= 4) return @([self decodeFLT:bytes]);
|
||||
} else if ([trimmedType isEqualToString:@"ui8"]) {
|
||||
if (size >= 1) return @([self decodeUI8:bytes]);
|
||||
@@ -59,6 +66,18 @@
|
||||
if (size >= 4) return @([self decodeUI32:bytes]);
|
||||
} else if ([trimmedType isEqualToString:@"flag"]) {
|
||||
if (size >= 1) return @(bytes[0] != 0);
|
||||
} else if (trimmedType.length == 4 && [trimmedType hasPrefix:@"sp"] && size >= 2) {
|
||||
int fracBits = hexDigitValue([trimmedType characterAtIndex:3]);
|
||||
if (fracBits >= 0 && fracBits <= 15) {
|
||||
int16_t raw = (int16_t)(((uint16_t)bytes[0] << 8) | (uint16_t)bytes[1]);
|
||||
return @((float)raw / (float)(1 << fracBits));
|
||||
}
|
||||
} else if (trimmedType.length == 4 && [trimmedType hasPrefix:@"fp"] && size >= 2) {
|
||||
int fracBits = hexDigitValue([trimmedType characterAtIndex:3]);
|
||||
if (fracBits >= 0 && fracBits <= 15) {
|
||||
uint16_t raw = ((uint16_t)bytes[0] << 8) | (uint16_t)bytes[1];
|
||||
return @((float)raw / (float)(1 << fracBits));
|
||||
}
|
||||
}
|
||||
|
||||
return nil;
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
#ifndef MMCPULoadProvider_h
|
||||
#define MMCPULoadProvider_h
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <mach/mach.h>
|
||||
#import <mach/processor_info.h>
|
||||
#import "MMTelemetryProvider.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
* MMCPULoadProvider
|
||||
* Samples real-time Mach host processor CPU load ticks, per-core utilization percentages,
|
||||
* and CPU operating frequency.
|
||||
*/
|
||||
@interface MMCPULoadProvider : NSObject <MMTelemetryProvider>
|
||||
|
||||
@property (nonatomic, readonly) natural_t coreCount;
|
||||
|
||||
/**
|
||||
* Static calculator method facilitating deterministic unit testing with mock tick data.
|
||||
*/
|
||||
+ (NSDictionary<NSString *, id> *)calculateLoadFromPreviousTicks:(const struct processor_cpu_load_info * _Nullable)prevTicks
|
||||
currentTicks:(const struct processor_cpu_load_info *)currTicks
|
||||
coreCount:(natural_t)coreCount;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
#endif /* MMCPULoadProvider_h */
|
||||
@@ -0,0 +1,201 @@
|
||||
#import "MMCPULoadProvider.h"
|
||||
#import <sys/sysctl.h>
|
||||
#import <os/lock.h>
|
||||
|
||||
@interface MMCPULoadProvider () {
|
||||
os_unfair_lock _lock;
|
||||
processor_cpu_load_info_t _previousCpuInfo;
|
||||
mach_msg_type_number_t _previousCpuInfoCount;
|
||||
natural_t _coreCount;
|
||||
uint64_t _maxFrequencyHz;
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation MMCPULoadProvider
|
||||
|
||||
- (instancetype)init {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
_lock = OS_UNFAIR_LOCK_INIT;
|
||||
_previousCpuInfo = NULL;
|
||||
_previousCpuInfoCount = 0;
|
||||
|
||||
// Read CPU core count
|
||||
natural_t cCount = 1;
|
||||
size_t size = sizeof(cCount);
|
||||
sysctlbyname("hw.logicalcpu", &cCount, &size, NULL, 0);
|
||||
_coreCount = cCount;
|
||||
|
||||
// Read maximum frequency
|
||||
uint64_t maxFreq = 0;
|
||||
size = sizeof(maxFreq);
|
||||
if (sysctlbyname("hw.cpufrequency_max", &maxFreq, &size, NULL, 0) != 0) {
|
||||
sysctlbyname("hw.cpufrequency", &maxFreq, &size, NULL, 0);
|
||||
}
|
||||
_maxFrequencyHz = maxFreq;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)dealloc {
|
||||
if (_previousCpuInfo != NULL) {
|
||||
free(_previousCpuInfo);
|
||||
_previousCpuInfo = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
- (MMTelemetryDomain)domain {
|
||||
return MMTelemetryDomainCPU;
|
||||
}
|
||||
|
||||
- (NSString *)providerIdentifier {
|
||||
return @"com.i3omb.macmonitor.telemetry.cpuload";
|
||||
}
|
||||
|
||||
- (BOOL)isAvailable {
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (natural_t)coreCount {
|
||||
return _coreCount;
|
||||
}
|
||||
|
||||
+ (NSDictionary<NSString *, id> *)calculateLoadFromPreviousTicks:(const struct processor_cpu_load_info * _Nullable)prevTicks
|
||||
currentTicks:(const struct processor_cpu_load_info *)currTicks
|
||||
coreCount:(natural_t)coreCount {
|
||||
if (!currTicks || coreCount == 0) return @{};
|
||||
|
||||
NSMutableArray<NSDictionary<NSString *, NSNumber *> *> *coresList = [NSMutableArray arrayWithCapacity:coreCount];
|
||||
double totalUserPercent = 0.0;
|
||||
double totalSystemPercent = 0.0;
|
||||
double totalIdlePercent = 0.0;
|
||||
double totalActivePercent = 0.0;
|
||||
|
||||
for (natural_t i = 0; i < coreCount; i++) {
|
||||
uint64_t user = currTicks[i].cpu_ticks[CPU_STATE_USER];
|
||||
uint64_t system = currTicks[i].cpu_ticks[CPU_STATE_SYSTEM];
|
||||
uint64_t idle = currTicks[i].cpu_ticks[CPU_STATE_IDLE];
|
||||
uint64_t nice = currTicks[i].cpu_ticks[CPU_STATE_NICE];
|
||||
|
||||
uint64_t deltaUser = 0;
|
||||
uint64_t deltaSystem = 0;
|
||||
uint64_t deltaIdle = 0;
|
||||
uint64_t deltaNice = 0;
|
||||
|
||||
if (prevTicks != NULL) {
|
||||
deltaUser = (user >= prevTicks[i].cpu_ticks[CPU_STATE_USER]) ? (user - prevTicks[i].cpu_ticks[CPU_STATE_USER]) : 0;
|
||||
deltaSystem = (system >= prevTicks[i].cpu_ticks[CPU_STATE_SYSTEM]) ? (system - prevTicks[i].cpu_ticks[CPU_STATE_SYSTEM]) : 0;
|
||||
deltaIdle = (idle >= prevTicks[i].cpu_ticks[CPU_STATE_IDLE]) ? (idle - prevTicks[i].cpu_ticks[CPU_STATE_IDLE]) : 0;
|
||||
deltaNice = (nice >= prevTicks[i].cpu_ticks[CPU_STATE_NICE]) ? (nice - prevTicks[i].cpu_ticks[CPU_STATE_NICE]) : 0;
|
||||
}
|
||||
|
||||
uint64_t deltaTotal = deltaUser + deltaSystem + deltaIdle + deltaNice;
|
||||
double uPct = 0.0, sPct = 0.0, iPct = 100.0, aPct = 0.0;
|
||||
|
||||
if (deltaTotal > 0) {
|
||||
uPct = ((double)deltaUser / (double)deltaTotal) * 100.0;
|
||||
sPct = ((double)deltaSystem / (double)deltaTotal) * 100.0;
|
||||
iPct = ((double)deltaIdle / (double)deltaTotal) * 100.0;
|
||||
aPct = 100.0 - iPct;
|
||||
if (aPct < 0.0) aPct = 0.0;
|
||||
if (aPct > 100.0) aPct = 100.0;
|
||||
}
|
||||
|
||||
totalUserPercent += uPct;
|
||||
totalSystemPercent += sPct;
|
||||
totalIdlePercent += iPct;
|
||||
totalActivePercent += aPct;
|
||||
|
||||
[coresList addObject:@{
|
||||
@"coreIndex": @(i),
|
||||
@"userPercent": @(uPct),
|
||||
@"systemPercent": @(sPct),
|
||||
@"idlePercent": @(iPct),
|
||||
@"totalPercent": @(aPct)
|
||||
}];
|
||||
}
|
||||
|
||||
double avgUser = coreCount > 0 ? (totalUserPercent / coreCount) : 0.0;
|
||||
double avgSystem = coreCount > 0 ? (totalSystemPercent / coreCount) : 0.0;
|
||||
double avgIdle = coreCount > 0 ? (totalIdlePercent / coreCount) : 100.0;
|
||||
double avgTotal = coreCount > 0 ? (totalActivePercent / coreCount) : 0.0;
|
||||
|
||||
return @{
|
||||
@"cores": coresList,
|
||||
@"coreCount": @(coreCount),
|
||||
@"userPercent": @(avgUser),
|
||||
@"systemPercent": @(avgSystem),
|
||||
@"idlePercent": @(avgIdle),
|
||||
@"totalPercent": @(avgTotal)
|
||||
};
|
||||
}
|
||||
|
||||
- (nullable NSDictionary<NSString *, id> *)sampleTelemetryWithError:(NSError **)error {
|
||||
natural_t numCPUs = 0;
|
||||
processor_info_array_t cpuInfo = NULL;
|
||||
mach_msg_type_number_t numCpuInfo = 0;
|
||||
|
||||
kern_return_t kr = host_processor_info(
|
||||
mach_host_self(),
|
||||
PROCESSOR_CPU_LOAD_INFO,
|
||||
&numCPUs,
|
||||
&cpuInfo,
|
||||
&numCpuInfo
|
||||
);
|
||||
|
||||
if (kr != KERN_SUCCESS || cpuInfo == NULL) {
|
||||
if (error) {
|
||||
*error = [NSError errorWithDomain:@"com.i3omb.MacMonitor.CPU"
|
||||
code:kr
|
||||
userInfo:@{NSLocalizedDescriptionKey: @"host_processor_info failed to read CPU ticks"}];
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
os_unfair_lock_lock(&_lock);
|
||||
|
||||
processor_cpu_load_info_t currentCpuInfo = (processor_cpu_load_info_t)cpuInfo;
|
||||
NSDictionary<NSString *, id> *metrics = [MMCPULoadProvider calculateLoadFromPreviousTicks:_previousCpuInfo
|
||||
currentTicks:currentCpuInfo
|
||||
coreCount:numCPUs];
|
||||
|
||||
// Free previous malloc buffer
|
||||
if (_previousCpuInfo != NULL) {
|
||||
free(_previousCpuInfo);
|
||||
_previousCpuInfo = NULL;
|
||||
}
|
||||
|
||||
// Allocate new buffer to preserve state for the next delta
|
||||
vm_size_t bufferSize = numCpuInfo * sizeof(integer_t);
|
||||
_previousCpuInfo = (processor_cpu_load_info_t)malloc(bufferSize);
|
||||
if (_previousCpuInfo != NULL) {
|
||||
memcpy(_previousCpuInfo, cpuInfo, bufferSize);
|
||||
_previousCpuInfoCount = numCpuInfo;
|
||||
}
|
||||
|
||||
// Deallocate the buffer returned by the kernel
|
||||
vm_deallocate(mach_task_self(), (vm_address_t)cpuInfo, numCpuInfo * sizeof(integer_t));
|
||||
|
||||
os_unfair_lock_unlock(&_lock);
|
||||
|
||||
// Read current frequency
|
||||
uint64_t currentFreq = 0;
|
||||
size_t size = sizeof(currentFreq);
|
||||
if (sysctlbyname("hw.cpufrequency", ¤tFreq, &size, NULL, 0) != 0) {
|
||||
currentFreq = _maxFrequencyHz;
|
||||
}
|
||||
|
||||
// Thermal State
|
||||
NSProcessInfoThermalState thermalState = [NSProcessInfo processInfo].thermalState;
|
||||
BOOL isThrottled = (thermalState >= NSProcessInfoThermalStateSerious);
|
||||
|
||||
NSMutableDictionary<NSString *, id> *result = [metrics mutableCopy];
|
||||
result[@"frequencyHz"] = @(currentFreq);
|
||||
result[@"maxFrequencyHz"] = @(_maxFrequencyHz);
|
||||
result[@"thermalState"] = @(thermalState);
|
||||
result[@"isThrottled"] = @(isThrottled);
|
||||
|
||||
return [result copy];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -0,0 +1,31 @@
|
||||
#ifndef MMFanTelemetryProvider_h
|
||||
#define MMFanTelemetryProvider_h
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "MMTelemetryProvider.h"
|
||||
#import "MMAppleSMCClient.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
* MMFanTelemetryProvider
|
||||
* Samples multi-fan telemetry from AppleSMC: current RPM, min RPM, max RPM, target RPM,
|
||||
* and fan utilization percentages.
|
||||
*/
|
||||
@interface MMFanTelemetryProvider : NSObject <MMTelemetryProvider>
|
||||
|
||||
@property (nonatomic, strong, readonly) MMAppleSMCClient *smcClient;
|
||||
@property (nonatomic, readonly) NSInteger fanCount;
|
||||
|
||||
- (instancetype)initWithSMCClient:(MMAppleSMCClient *)client;
|
||||
|
||||
/**
|
||||
* Static calculator method for deterministic unit testing.
|
||||
*/
|
||||
+ (NSDictionary<NSString *, id> *)calculateFanMetricsFromFanList:(NSArray<NSDictionary<NSString *, NSNumber *> *> *)fanList;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
#endif /* MMFanTelemetryProvider_h */
|
||||
@@ -0,0 +1,147 @@
|
||||
#import "MMFanTelemetryProvider.h"
|
||||
|
||||
@interface MMFanTelemetryProvider () {
|
||||
MMAppleSMCClient *_smcClient;
|
||||
NSInteger _probedFanCount;
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation MMFanTelemetryProvider
|
||||
|
||||
- (instancetype)init {
|
||||
return [self initWithSMCClient:[MMAppleSMCClient sharedClient]];
|
||||
}
|
||||
|
||||
- (instancetype)initWithSMCClient:(MMAppleSMCClient *)client {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
_smcClient = client;
|
||||
_probedFanCount = -1;
|
||||
[self probeFans];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)probeFans {
|
||||
if (!_smcClient.isAvailable) return;
|
||||
|
||||
NSNumber *num = [_smcClient readNumericValueForKey:@"FNum" error:nil];
|
||||
if (num) {
|
||||
_probedFanCount = [num integerValue];
|
||||
} else {
|
||||
// Fallback probe F0Ac
|
||||
NSNumber *f0 = [_smcClient readNumericValueForKey:@"F0Ac" error:nil];
|
||||
if (f0 && [f0 doubleValue] >= 0.0) {
|
||||
_probedFanCount = 1;
|
||||
NSNumber *f1 = [_smcClient readNumericValueForKey:@"F1Ac" error:nil];
|
||||
if (f1 && [f1 doubleValue] >= 0.0) {
|
||||
_probedFanCount = 2;
|
||||
}
|
||||
} else {
|
||||
_probedFanCount = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (MMTelemetryDomain)domain {
|
||||
return MMTelemetryDomainFan;
|
||||
}
|
||||
|
||||
- (NSString *)providerIdentifier {
|
||||
return @"com.i3omb.macmonitor.telemetry.fan";
|
||||
}
|
||||
|
||||
- (BOOL)isAvailable {
|
||||
return _smcClient.isAvailable;
|
||||
}
|
||||
|
||||
- (MMAppleSMCClient *)smcClient {
|
||||
return _smcClient;
|
||||
}
|
||||
|
||||
- (NSInteger)fanCount {
|
||||
return (_probedFanCount >= 0) ? _probedFanCount : 0;
|
||||
}
|
||||
|
||||
+ (NSDictionary<NSString *, id> *)calculateFanMetricsFromFanList:(NSArray<NSDictionary<NSString *, NSNumber *> *> *)fanList {
|
||||
if (!fanList || fanList.count == 0) {
|
||||
return @{
|
||||
@"fanCount": @(0),
|
||||
@"fans": @[],
|
||||
@"averageRPM": @(0.0),
|
||||
@"peakRPM": @(0.0)
|
||||
};
|
||||
}
|
||||
|
||||
NSMutableArray<NSDictionary<NSString *, id> *> *resultList = [NSMutableArray arrayWithCapacity:fanList.count];
|
||||
double sumRPM = 0.0;
|
||||
double peakRPM = 0.0;
|
||||
|
||||
for (NSUInteger i = 0; i < fanList.count; i++) {
|
||||
NSDictionary<NSString *, NSNumber *> *raw = fanList[i];
|
||||
double current = [raw[@"currentRPM"] doubleValue];
|
||||
double min = [raw[@"minRPM"] doubleValue];
|
||||
double max = [raw[@"maxRPM"] doubleValue];
|
||||
double target = [raw[@"targetRPM"] doubleValue];
|
||||
|
||||
double util = 0.0;
|
||||
if (max > min && current >= min) {
|
||||
util = ((current - min) / (max - min)) * 100.0;
|
||||
if (util < 0.0) util = 0.0;
|
||||
if (util > 100.0) util = 100.0;
|
||||
}
|
||||
|
||||
if (current > peakRPM) peakRPM = current;
|
||||
sumRPM += current;
|
||||
|
||||
[resultList addObject:@{
|
||||
@"fanIndex": @(i),
|
||||
@"currentRPM": @(current),
|
||||
@"minRPM": @(min),
|
||||
@"maxRPM": @(max),
|
||||
@"targetRPM": @(target),
|
||||
@"utilizationPercent": @(util)
|
||||
}];
|
||||
}
|
||||
|
||||
double avgRPM = fanList.count > 0 ? (sumRPM / fanList.count) : 0.0;
|
||||
|
||||
return @{
|
||||
@"fanCount": @(fanList.count),
|
||||
@"fans": [resultList copy],
|
||||
@"averageRPM": @(avgRPM),
|
||||
@"peakRPM": @(peakRPM)
|
||||
};
|
||||
}
|
||||
|
||||
- (nullable NSDictionary<NSString *, id> *)sampleTelemetryWithError:(NSError **)error {
|
||||
if (_probedFanCount < 0 && _smcClient.isAvailable) {
|
||||
[self probeFans];
|
||||
}
|
||||
|
||||
NSInteger count = [self fanCount];
|
||||
NSMutableArray<NSDictionary<NSString *, NSNumber *> *> *rawList = [NSMutableArray arrayWithCapacity:count];
|
||||
|
||||
for (NSInteger i = 0; i < count; i++) {
|
||||
NSString *acKey = [NSString stringWithFormat:@"F%ldAc", (long)i];
|
||||
NSString *mnKey = [NSString stringWithFormat:@"F%ldMn", (long)i];
|
||||
NSString *mxKey = [NSString stringWithFormat:@"F%ldMx", (long)i];
|
||||
NSString *tgKey = [NSString stringWithFormat:@"F%ldTg", (long)i];
|
||||
|
||||
NSNumber *ac = [_smcClient readNumericValueForKey:acKey error:nil] ?: @(0.0);
|
||||
NSNumber *mn = [_smcClient readNumericValueForKey:mnKey error:nil] ?: @(0.0);
|
||||
NSNumber *mx = [_smcClient readNumericValueForKey:mxKey error:nil] ?: @(6000.0);
|
||||
NSNumber *tg = [_smcClient readNumericValueForKey:tgKey error:nil] ?: ac;
|
||||
|
||||
[rawList addObject:@{
|
||||
@"currentRPM": ac,
|
||||
@"minRPM": mn,
|
||||
@"maxRPM": mx,
|
||||
@"targetRPM": tg
|
||||
}];
|
||||
}
|
||||
|
||||
return [MMFanTelemetryProvider calculateFanMetricsFromFanList:rawList];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -0,0 +1,32 @@
|
||||
#ifndef MMMemoryTelemetryProvider_h
|
||||
#define MMMemoryTelemetryProvider_h
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <mach/mach.h>
|
||||
#import <sys/sysctl.h>
|
||||
#import "MMTelemetryProvider.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
* MMMemoryTelemetryProvider
|
||||
* Samples Mach virtual memory statistics, wired/active/inactive/compressed memory allocations,
|
||||
* swap usage, and system-wide memory pressure levels.
|
||||
*/
|
||||
@interface MMMemoryTelemetryProvider : NSObject <MMTelemetryProvider>
|
||||
|
||||
@property (nonatomic, readonly) uint64_t totalPhysicalMemoryBytes;
|
||||
|
||||
/**
|
||||
* Deterministic helper method for unit testing VM metric calculations.
|
||||
*/
|
||||
+ (NSDictionary<NSString *, id> *)calculateMemoryMetricsWithVMInfo:(const vm_statistics64_data_t *)vmInfo
|
||||
pageSize:(vm_size_t)pageSize
|
||||
totalPhysicalRAM:(uint64_t)totalRAM
|
||||
swapUsage:(const struct xsw_usage * _Nullable)swap;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
#endif /* MMMemoryTelemetryProvider_h */
|
||||
@@ -0,0 +1,135 @@
|
||||
#import "MMMemoryTelemetryProvider.h"
|
||||
#import <sys/sysctl.h>
|
||||
|
||||
@interface MMMemoryTelemetryProvider () {
|
||||
uint64_t _totalPhysicalMemoryBytes;
|
||||
vm_size_t _pageSize;
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation MMMemoryTelemetryProvider
|
||||
|
||||
- (instancetype)init {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
// Read physical memory size
|
||||
uint64_t memSize = 0;
|
||||
size_t size = sizeof(memSize);
|
||||
sysctlbyname("hw.memsize", &memSize, &size, NULL, 0);
|
||||
_totalPhysicalMemoryBytes = memSize;
|
||||
|
||||
// Read virtual memory page size
|
||||
vm_size_t pSize = 4096;
|
||||
host_page_size(mach_host_self(), &pSize);
|
||||
_pageSize = pSize;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (MMTelemetryDomain)domain {
|
||||
return MMTelemetryDomainMemory;
|
||||
}
|
||||
|
||||
- (NSString *)providerIdentifier {
|
||||
return @"com.i3omb.macmonitor.telemetry.memory";
|
||||
}
|
||||
|
||||
- (BOOL)isAvailable {
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (uint64_t)totalPhysicalMemoryBytes {
|
||||
return _totalPhysicalMemoryBytes;
|
||||
}
|
||||
|
||||
+ (NSDictionary<NSString *, id> *)calculateMemoryMetricsWithVMInfo:(const vm_statistics64_data_t *)vmInfo
|
||||
pageSize:(vm_size_t)pageSize
|
||||
totalPhysicalRAM:(uint64_t)totalRAM
|
||||
swapUsage:(const struct xsw_usage * _Nullable)swap {
|
||||
if (!vmInfo) return @{};
|
||||
|
||||
uint64_t appMemory = (vmInfo->internal_page_count > vmInfo->purgeable_count)
|
||||
? (uint64_t)(vmInfo->internal_page_count - vmInfo->purgeable_count) * pageSize
|
||||
: 0;
|
||||
uint64_t wired = (uint64_t)vmInfo->wire_count * pageSize;
|
||||
uint64_t compressed = (uint64_t)vmInfo->compressor_page_count * pageSize;
|
||||
uint64_t used = appMemory + wired + compressed;
|
||||
|
||||
uint64_t freeRAM = (uint64_t)vmInfo->free_count * pageSize;
|
||||
uint64_t purgeable = (uint64_t)vmInfo->purgeable_count * pageSize;
|
||||
uint64_t active = (uint64_t)vmInfo->active_count * pageSize;
|
||||
uint64_t inactive = (uint64_t)vmInfo->inactive_count * pageSize;
|
||||
|
||||
// Calculate Memory Pressure percentage
|
||||
uint64_t availableForUse = (uint64_t)(vmInfo->free_count + vmInfo->inactive_count) * pageSize;
|
||||
double pressurePct = 0.0;
|
||||
if (totalRAM > 0) {
|
||||
pressurePct = (1.0 - ((double)availableForUse / (double)totalRAM)) * 100.0;
|
||||
if (pressurePct < 0.0) pressurePct = 0.0;
|
||||
if (pressurePct > 100.0) pressurePct = 100.0;
|
||||
}
|
||||
|
||||
NSString *pressureStatus = @"Normal";
|
||||
if (pressurePct >= 80.0) {
|
||||
pressureStatus = @"Critical";
|
||||
} else if (pressurePct >= 60.0) {
|
||||
pressureStatus = @"Warning";
|
||||
}
|
||||
|
||||
uint64_t swapTotal = swap ? swap->xsu_total : 0;
|
||||
uint64_t swapUsed = swap ? swap->xsu_used : 0;
|
||||
uint64_t swapFree = swap ? swap->xsu_avail : 0;
|
||||
|
||||
return @{
|
||||
@"totalBytes": @(totalRAM),
|
||||
@"usedBytes": @(used),
|
||||
@"freeBytes": @(freeRAM),
|
||||
@"appMemoryBytes": @(appMemory),
|
||||
@"wiredBytes": @(wired),
|
||||
@"compressedBytes": @(compressed),
|
||||
@"purgeableBytes": @(purgeable),
|
||||
@"activeBytes": @(active),
|
||||
@"inactiveBytes": @(inactive),
|
||||
@"memoryPressurePercent": @(pressurePct),
|
||||
@"memoryPressureStatus": pressureStatus,
|
||||
@"swapTotalBytes": @(swapTotal),
|
||||
@"swapUsedBytes": @(swapUsed),
|
||||
@"swapFreeBytes": @(swapFree)
|
||||
};
|
||||
}
|
||||
|
||||
- (nullable NSDictionary<NSString *, id> *)sampleTelemetryWithError:(NSError **)error {
|
||||
vm_statistics64_data_t vmInfo = {0};
|
||||
mach_msg_type_number_t count = HOST_VM_INFO64_COUNT;
|
||||
|
||||
kern_return_t kr = host_statistics64(
|
||||
mach_host_self(),
|
||||
HOST_VM_INFO64,
|
||||
(host_info64_t)&vmInfo,
|
||||
&count
|
||||
);
|
||||
|
||||
if (kr != KERN_SUCCESS) {
|
||||
if (error) {
|
||||
*error = [NSError errorWithDomain:@"com.i3omb.MacMonitor.Memory"
|
||||
code:kr
|
||||
userInfo:@{NSLocalizedDescriptionKey: @"host_statistics64 failed to sample VM metrics"}];
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
// Read swap usage
|
||||
struct xsw_usage swap = {0};
|
||||
size_t swapSize = sizeof(swap);
|
||||
struct xsw_usage *swapPtr = NULL;
|
||||
if (sysctlbyname("vm.swapusage", &swap, &swapSize, NULL, 0) == 0) {
|
||||
swapPtr = &swap;
|
||||
}
|
||||
|
||||
return [MMMemoryTelemetryProvider calculateMemoryMetricsWithVMInfo:&vmInfo
|
||||
pageSize:_pageSize
|
||||
totalPhysicalRAM:_totalPhysicalMemoryBytes
|
||||
swapUsage:swapPtr];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -0,0 +1,45 @@
|
||||
#ifndef MMPowerTelemetryProvider_h
|
||||
#define MMPowerTelemetryProvider_h
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "MMTelemetryProvider.h"
|
||||
#import "MMAppleSMCClient.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
* MMPowerTelemetryProvider
|
||||
* Samples system power draw, CPU/GPU package wattage, rail voltages, and currents
|
||||
* via AppleSMC and AppleSmartBattery IOKit interfaces.
|
||||
*/
|
||||
@interface MMPowerTelemetryProvider : NSObject <MMTelemetryProvider>
|
||||
|
||||
@property (nonatomic, strong, readonly) MMAppleSMCClient *smcClient;
|
||||
@property (nonatomic, readonly) NSArray<NSString *> *discoveredPowerKeys;
|
||||
@property (nonatomic, readonly) NSArray<NSString *> *discoveredVoltageKeys;
|
||||
@property (nonatomic, readonly) NSArray<NSString *> *discoveredCurrentKeys;
|
||||
|
||||
- (instancetype)init;
|
||||
- (instancetype)initWithSMCClient:(MMAppleSMCClient *)client;
|
||||
|
||||
/**
|
||||
* Friendly name for power, voltage, and current SMC keys.
|
||||
*/
|
||||
+ (NSString *)humanReadableNameForKey:(NSString *)key;
|
||||
|
||||
/**
|
||||
* Unit of measurement for SMC key ("W", "V", "A").
|
||||
*/
|
||||
+ (NSString *)unitForKey:(NSString *)key;
|
||||
|
||||
/**
|
||||
* Pure calculator method for deterministic unit testing.
|
||||
*/
|
||||
+ (NSDictionary<NSString *, id> *)calculatePowerMetricsWithReadings:(NSDictionary<NSString *, NSNumber *> *)readings
|
||||
batteryInfo:(nullable NSDictionary<NSString *, id> *)batteryInfo;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
#endif /* MMPowerTelemetryProvider_h */
|
||||
@@ -0,0 +1,314 @@
|
||||
#import "MMPowerTelemetryProvider.h"
|
||||
#import <IOKit/IOKitLib.h>
|
||||
#import <IOKit/ps/IOPowerSources.h>
|
||||
#import <IOKit/ps/IOPSKeys.h>
|
||||
|
||||
@interface MMPowerTelemetryProvider () {
|
||||
MMAppleSMCClient *_smcClient;
|
||||
NSMutableArray<NSString *> *_discoveredPowerKeys;
|
||||
NSMutableArray<NSString *> *_discoveredVoltageKeys;
|
||||
NSMutableArray<NSString *> *_discoveredCurrentKeys;
|
||||
BOOL _probed;
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation MMPowerTelemetryProvider
|
||||
|
||||
- (instancetype)init {
|
||||
return [self initWithSMCClient:[MMAppleSMCClient sharedClient]];
|
||||
}
|
||||
|
||||
- (instancetype)initWithSMCClient:(MMAppleSMCClient *)client {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
_smcClient = client;
|
||||
_discoveredPowerKeys = [NSMutableArray array];
|
||||
_discoveredVoltageKeys = [NSMutableArray array];
|
||||
_discoveredCurrentKeys = [NSMutableArray array];
|
||||
[self probeSensors];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)probeSensors {
|
||||
if (!_smcClient.isAvailable) return;
|
||||
|
||||
NSArray<NSString *> *powerCandidates = @[
|
||||
@"PSTR", @"PDTR", @"PCPR", @"PCTR", @"PC0C", @"PCPT",
|
||||
@"PG0R", @"PGTR", @"PMSR", @"PM0R", @"PCPC"
|
||||
];
|
||||
|
||||
NSArray<NSString *> *voltageCandidates = @[
|
||||
@"VC0C", @"VD0R", @"VN0C", @"VM0R", @"VP0R"
|
||||
];
|
||||
|
||||
NSArray<NSString *> *currentCandidates = @[
|
||||
@"IC0C", @"ID0R", @"IG0C", @"IM0R"
|
||||
];
|
||||
|
||||
[_discoveredPowerKeys removeAllObjects];
|
||||
for (NSString *key in powerCandidates) {
|
||||
NSNumber *val = [_smcClient readNumericValueForKey:key error:nil];
|
||||
if (val && [val doubleValue] > 0.0 && [val doubleValue] < 5000.0) {
|
||||
[_discoveredPowerKeys addObject:key];
|
||||
}
|
||||
}
|
||||
|
||||
[_discoveredVoltageKeys removeAllObjects];
|
||||
for (NSString *key in voltageCandidates) {
|
||||
NSNumber *val = [_smcClient readNumericValueForKey:key error:nil];
|
||||
if (val && [val doubleValue] > 0.0) {
|
||||
[_discoveredVoltageKeys addObject:key];
|
||||
}
|
||||
}
|
||||
|
||||
[_discoveredCurrentKeys removeAllObjects];
|
||||
for (NSString *key in currentCandidates) {
|
||||
NSNumber *val = [_smcClient readNumericValueForKey:key error:nil];
|
||||
if (val && [val doubleValue] > 0.0) {
|
||||
[_discoveredCurrentKeys addObject:key];
|
||||
}
|
||||
}
|
||||
|
||||
_probed = YES;
|
||||
}
|
||||
|
||||
- (MMTelemetryDomain)domain {
|
||||
return MMTelemetryDomainPower;
|
||||
}
|
||||
|
||||
- (NSString *)providerIdentifier {
|
||||
return @"com.i3omb.macmonitor.telemetry.power";
|
||||
}
|
||||
|
||||
- (BOOL)isAvailable {
|
||||
return _smcClient.isAvailable;
|
||||
}
|
||||
|
||||
- (MMAppleSMCClient *)smcClient {
|
||||
return _smcClient;
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)discoveredPowerKeys {
|
||||
return [_discoveredPowerKeys copy];
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)discoveredVoltageKeys {
|
||||
return [_discoveredVoltageKeys copy];
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)discoveredCurrentKeys {
|
||||
return [_discoveredCurrentKeys copy];
|
||||
}
|
||||
|
||||
+ (NSString *)unitForKey:(NSString *)key {
|
||||
if ([key hasPrefix:@"P"]) return @"W";
|
||||
if ([key hasPrefix:@"V"]) return @"V";
|
||||
if ([key hasPrefix:@"I"]) return @"A";
|
||||
return @"";
|
||||
}
|
||||
|
||||
+ (NSString *)humanReadableNameForKey:(NSString *)key {
|
||||
static NSDictionary<NSString *, NSString *> *names = nil;
|
||||
static dispatch_once_t onceToken;
|
||||
dispatch_once(&onceToken, ^{
|
||||
names = @{
|
||||
@"PSTR": @"Total System Power",
|
||||
@"PDTR": @"DC-In Total Power",
|
||||
@"PCPR": @"CPU Package Power",
|
||||
@"PCTR": @"CPU Total Power",
|
||||
@"PC0C": @"CPU Core Power",
|
||||
@"PCPT": @"CPU Package Total Power",
|
||||
@"PG0R": @"GPU 0 Power",
|
||||
@"PGTR": @"GPU Total Power",
|
||||
@"PMSR": @"Memory Subsystem Power",
|
||||
@"PM0R": @"Memory Rail Power",
|
||||
@"PCPC": @"Power Supply In / AC",
|
||||
@"VC0C": @"CPU Core Voltage",
|
||||
@"VD0R": @"DC-In Rail Voltage",
|
||||
@"VN0C": @"PCH Rail Voltage",
|
||||
@"VM0R": @"Memory Rail Voltage",
|
||||
@"VP0R": @"Power Supply Voltage",
|
||||
@"IC0C": @"CPU Core Current",
|
||||
@"ID0R": @"DC-In Rail Current",
|
||||
@"IG0C": @"GPU Rail Current",
|
||||
@"IM0R": @"Memory Rail Current"
|
||||
};
|
||||
});
|
||||
|
||||
NSString *match = names[key];
|
||||
return match ?: key;
|
||||
}
|
||||
|
||||
+ (NSDictionary<NSString *, id> *)calculatePowerMetricsWithReadings:(NSDictionary<NSString *, NSNumber *> *)readings
|
||||
batteryInfo:(nullable NSDictionary<NSString *, id> *)batteryInfo {
|
||||
// Determine system total power
|
||||
double systemTotal = 0.0;
|
||||
if (readings[@"PSTR"]) {
|
||||
systemTotal = [readings[@"PSTR"] doubleValue];
|
||||
} else if (readings[@"PDTR"]) {
|
||||
systemTotal = [readings[@"PDTR"] doubleValue];
|
||||
} else if (batteryInfo[@"batteryWatts"]) {
|
||||
systemTotal = [batteryInfo[@"batteryWatts"] doubleValue];
|
||||
}
|
||||
|
||||
// CPU wattage
|
||||
double cpuWatts = 0.0;
|
||||
if (readings[@"PCPR"]) {
|
||||
cpuWatts = [readings[@"PCPR"] doubleValue];
|
||||
} else if (readings[@"PCTR"]) {
|
||||
cpuWatts = [readings[@"PCTR"] doubleValue];
|
||||
} else if (readings[@"PC0C"]) {
|
||||
cpuWatts = [readings[@"PC0C"] doubleValue];
|
||||
} else if (readings[@"PCPT"]) {
|
||||
cpuWatts = [readings[@"PCPT"] doubleValue];
|
||||
}
|
||||
|
||||
// Voltage & Current
|
||||
double cpuVoltage = readings[@"VC0C"] ? [readings[@"VC0C"] doubleValue] : 0.0;
|
||||
double cpuCurrent = readings[@"IC0C"] ? [readings[@"IC0C"] doubleValue] : 0.0;
|
||||
|
||||
// Fallback: calculate cpuWatts from V * I if SMC didn't provide direct wattage
|
||||
if (cpuWatts == 0.0 && cpuVoltage > 0.0 && cpuCurrent > 0.0) {
|
||||
cpuWatts = cpuVoltage * cpuCurrent;
|
||||
}
|
||||
|
||||
// GPU wattage
|
||||
double gpuWatts = 0.0;
|
||||
if (readings[@"PG0R"]) {
|
||||
gpuWatts = [readings[@"PG0R"] doubleValue];
|
||||
} else if (readings[@"PGTR"]) {
|
||||
gpuWatts = [readings[@"PGTR"] doubleValue];
|
||||
}
|
||||
|
||||
// Memory wattage
|
||||
double memoryWatts = 0.0;
|
||||
if (readings[@"PMSR"]) {
|
||||
memoryWatts = [readings[@"PMSR"] doubleValue];
|
||||
} else if (readings[@"PM0R"]) {
|
||||
memoryWatts = [readings[@"PM0R"] doubleValue];
|
||||
}
|
||||
|
||||
// Collect all individual sensor entries
|
||||
NSMutableArray<NSDictionary<NSString *, id> *> *sensors = [NSMutableArray arrayWithCapacity:readings.count];
|
||||
NSArray<NSString *> *sortedKeys = [readings.allKeys sortedArrayUsingSelector:@selector(compare:)];
|
||||
for (NSString *k in sortedKeys) {
|
||||
double val = [readings[k] doubleValue];
|
||||
[sensors addObject:@{
|
||||
@"key": k,
|
||||
@"name": [self humanReadableNameForKey:k],
|
||||
@"value": @(val),
|
||||
@"unit": [self unitForKey:k]
|
||||
}];
|
||||
}
|
||||
|
||||
NSString *powerSource = batteryInfo[@"powerSource"] ?: @"AC Power";
|
||||
BOOL isCharging = [batteryInfo[@"isCharging"] boolValue];
|
||||
double batteryLevel = [batteryInfo[@"batteryLevel"] doubleValue];
|
||||
|
||||
return @{
|
||||
@"systemTotalWatts": @(systemTotal),
|
||||
@"cpuWatts": @(cpuWatts),
|
||||
@"gpuWatts": @(gpuWatts),
|
||||
@"memoryWatts": @(memoryWatts),
|
||||
@"cpuVoltage": @(cpuVoltage),
|
||||
@"cpuCurrent": @(cpuCurrent),
|
||||
@"powerSource": powerSource,
|
||||
@"isCharging": @(isCharging),
|
||||
@"batteryLevel": @(batteryLevel),
|
||||
@"sensors": sensors
|
||||
};
|
||||
}
|
||||
|
||||
- (nullable NSDictionary<NSString *, id> *)sampleBatteryInfo {
|
||||
CFTypeRef psInfo = IOPSCopyPowerSourcesInfo();
|
||||
if (!psInfo) return nil;
|
||||
|
||||
CFArrayRef psList = IOPSCopyPowerSourcesList(psInfo);
|
||||
if (!psList) {
|
||||
CFRelease(psInfo);
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSString *stateStr = @"AC Power";
|
||||
BOOL isCharging = NO;
|
||||
double capacity = 100.0;
|
||||
|
||||
if (CFArrayGetCount(psList) > 0) {
|
||||
CFTypeRef ps = CFArrayGetValueAtIndex(psList, 0);
|
||||
CFDictionaryRef desc = IOPSGetPowerSourceDescription(psInfo, ps);
|
||||
if (desc) {
|
||||
NSDictionary *dict = (__bridge NSDictionary *)desc;
|
||||
stateStr = dict[@"Power Source State"] ?: @"AC Power";
|
||||
isCharging = [dict[@"Is Charging"] boolValue];
|
||||
if (dict[@"Current Capacity"]) {
|
||||
capacity = [dict[@"Current Capacity"] doubleValue];
|
||||
}
|
||||
}
|
||||
}
|
||||
CFRelease(psList);
|
||||
CFRelease(psInfo);
|
||||
|
||||
// Sample AppleSmartBattery for instantaneous voltage and current
|
||||
double batteryWatts = 0.0;
|
||||
double batteryVoltage = 0.0;
|
||||
double batteryAmperage = 0.0;
|
||||
|
||||
io_service_t service = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("AppleSmartBattery"));
|
||||
if (service != IO_OBJECT_NULL) {
|
||||
CFMutableDictionaryRef props = NULL;
|
||||
if (IORegistryEntryCreateCFProperties(service, &props, kCFAllocatorDefault, 0) == KERN_SUCCESS && props) {
|
||||
NSDictionary *dict = (__bridge NSDictionary *)props;
|
||||
double v_mV = [dict[@"Voltage"] doubleValue];
|
||||
double a_mA = dict[@"InstantAmperage"] ? [dict[@"InstantAmperage"] doubleValue] : [dict[@"Amperage"] doubleValue];
|
||||
|
||||
batteryVoltage = v_mV / 1000.0;
|
||||
batteryAmperage = fabs(a_mA) / 1000.0;
|
||||
batteryWatts = batteryVoltage * batteryAmperage;
|
||||
|
||||
CFRelease(props);
|
||||
}
|
||||
IOObjectRelease(service);
|
||||
}
|
||||
|
||||
return @{
|
||||
@"powerSource": stateStr,
|
||||
@"isCharging": @(isCharging),
|
||||
@"batteryLevel": @(capacity),
|
||||
@"batteryVoltage": @(batteryVoltage),
|
||||
@"batteryAmperage": @(batteryAmperage),
|
||||
@"batteryWatts": @(batteryWatts)
|
||||
};
|
||||
}
|
||||
|
||||
- (nullable NSDictionary<NSString *, id> *)sampleTelemetryWithError:(NSError **)error {
|
||||
if (!_probed && _smcClient.isAvailable) {
|
||||
[self probeSensors];
|
||||
}
|
||||
|
||||
NSMutableDictionary<NSString *, NSNumber *> *readings = [NSMutableDictionary dictionary];
|
||||
|
||||
NSMutableArray<NSString *> *allKeys = [NSMutableArray arrayWithArray:_discoveredPowerKeys];
|
||||
[allKeys addObjectsFromArray:_discoveredVoltageKeys];
|
||||
[allKeys addObjectsFromArray:_discoveredCurrentKeys];
|
||||
|
||||
for (NSString *key in allKeys) {
|
||||
NSNumber *val = [_smcClient readNumericValueForKey:key error:nil];
|
||||
if (val) {
|
||||
double v = [val doubleValue];
|
||||
// Normalize mV or mA if values appear raw
|
||||
if ([key hasPrefix:@"V"] && v > 100.0) {
|
||||
v /= 1000.0;
|
||||
} else if ([key hasPrefix:@"I"] && v > 500.0) {
|
||||
v /= 1000.0;
|
||||
}
|
||||
readings[key] = @(v);
|
||||
}
|
||||
}
|
||||
|
||||
NSDictionary<NSString *, id> *batteryInfo = [self sampleBatteryInfo];
|
||||
return [MMPowerTelemetryProvider calculatePowerMetricsWithReadings:readings
|
||||
batteryInfo:batteryInfo];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -0,0 +1,26 @@
|
||||
#ifndef MMStorageTelemetryProvider_h
|
||||
#define MMStorageTelemetryProvider_h
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <sys/mount.h>
|
||||
#import "MMTelemetryProvider.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
* MMStorageTelemetryProvider
|
||||
* Samples mounted disk volumes, APFS containers, used/free storage capacity,
|
||||
* and mount filesystem attributes.
|
||||
*/
|
||||
@interface MMStorageTelemetryProvider : NSObject <MMTelemetryProvider>
|
||||
|
||||
/**
|
||||
* Static parser method for converting statfs structures into volume dictionaries.
|
||||
*/
|
||||
+ (NSArray<NSDictionary<NSString *, id> *> *)parseStatFSBuffer:(const struct statfs *)buffer count:(int)count;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
#endif /* MMStorageTelemetryProvider_h */
|
||||
@@ -0,0 +1,108 @@
|
||||
#import "MMStorageTelemetryProvider.h"
|
||||
|
||||
@implementation MMStorageTelemetryProvider
|
||||
|
||||
- (MMTelemetryDomain)domain {
|
||||
return MMTelemetryDomainStorage;
|
||||
}
|
||||
|
||||
- (NSString *)providerIdentifier {
|
||||
return @"com.i3omb.macmonitor.telemetry.storage";
|
||||
}
|
||||
|
||||
- (BOOL)isAvailable {
|
||||
return YES;
|
||||
}
|
||||
|
||||
+ (NSArray<NSDictionary<NSString *, id> *> *)parseStatFSBuffer:(const struct statfs *)buffer count:(int)count {
|
||||
if (!buffer || count <= 0) return @[];
|
||||
|
||||
NSMutableArray<NSDictionary<NSString *, id> *> *volumes = [NSMutableArray arrayWithCapacity:count];
|
||||
|
||||
for (int i = 0; i < count; i++) {
|
||||
const struct statfs *mnt = &buffer[i];
|
||||
|
||||
// Only include local mounts
|
||||
if (!(mnt->f_flags & MNT_LOCAL)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
NSString *mountPoint = [NSString stringWithUTF8String:mnt->f_mntonname];
|
||||
NSString *deviceName = [NSString stringWithUTF8String:mnt->f_mntfromname];
|
||||
NSString *fsType = [NSString stringWithUTF8String:mnt->f_fstypename];
|
||||
|
||||
// Exclude virtual/internal devfs, autodefs, and synthetic system roots
|
||||
if ([fsType isEqualToString:@"devfs"] ||
|
||||
[fsType isEqualToString:@"autofs"] ||
|
||||
[mountPoint hasPrefix:@"/System/Volumes/Data/"] ||
|
||||
[deviceName containsString:@"com.apple.os.update"]) {
|
||||
continue;
|
||||
}
|
||||
|
||||
uint64_t blockSize = (uint64_t)mnt->f_bsize;
|
||||
uint64_t totalBytes = (uint64_t)mnt->f_blocks * blockSize;
|
||||
uint64_t freeBytes = (uint64_t)mnt->f_bfree * blockSize;
|
||||
uint64_t availBytes = (uint64_t)mnt->f_bavail * blockSize;
|
||||
uint64_t usedBytes = (totalBytes >= freeBytes) ? (totalBytes - freeBytes) : 0;
|
||||
|
||||
if (totalBytes == 0) continue;
|
||||
|
||||
double usedPercent = ((double)usedBytes / (double)totalBytes) * 100.0;
|
||||
if (usedPercent < 0.0) usedPercent = 0.0;
|
||||
if (usedPercent > 100.0) usedPercent = 100.0;
|
||||
|
||||
NSString *volumeName = [mountPoint lastPathComponent];
|
||||
if ([mountPoint isEqualToString:@"/"]) {
|
||||
volumeName = @"Macintosh HD";
|
||||
}
|
||||
|
||||
BOOL isReadOnly = (mnt->f_flags & MNT_RDONLY) != 0;
|
||||
|
||||
[volumes addObject:@{
|
||||
@"volumeName": volumeName,
|
||||
@"mountPoint": mountPoint,
|
||||
@"devicePath": deviceName,
|
||||
@"fsType": fsType,
|
||||
@"totalBytes": @(totalBytes),
|
||||
@"usedBytes": @(usedBytes),
|
||||
@"freeBytes": @(freeBytes),
|
||||
@"availableBytes": @(availBytes),
|
||||
@"usedPercent": @(usedPercent),
|
||||
@"isReadOnly": @(isReadOnly)
|
||||
}];
|
||||
}
|
||||
|
||||
return [volumes copy];
|
||||
}
|
||||
|
||||
- (nullable NSDictionary<NSString *, id> *)sampleTelemetryWithError:(NSError **)error {
|
||||
struct statfs *mntbuf = NULL;
|
||||
int count = getmntinfo(&mntbuf, MNT_WAIT);
|
||||
|
||||
if (count <= 0 || mntbuf == NULL) {
|
||||
if (error) {
|
||||
*error = [NSError errorWithDomain:@"com.i3omb.MacMonitor.Storage"
|
||||
code:-1
|
||||
userInfo:@{NSLocalizedDescriptionKey: @"getmntinfo returned no mounted filesystems"}];
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSArray *volumes = [MMStorageTelemetryProvider parseStatFSBuffer:mntbuf count:count];
|
||||
|
||||
uint64_t totalStorage = 0;
|
||||
uint64_t totalUsed = 0;
|
||||
for (NSDictionary *v in volumes) {
|
||||
totalStorage += [v[@"totalBytes"] unsignedLongLongValue];
|
||||
totalUsed += [v[@"usedBytes"] unsignedLongLongValue];
|
||||
}
|
||||
|
||||
return @{
|
||||
@"volumes": volumes,
|
||||
@"volumeCount": @(volumes.count),
|
||||
@"aggregateTotalBytes": @(totalStorage),
|
||||
@"aggregateUsedBytes": @(totalUsed)
|
||||
};
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -0,0 +1,34 @@
|
||||
#ifndef MMCPUThermalProvider_h
|
||||
#define MMCPUThermalProvider_h
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "MMTelemetryProvider.h"
|
||||
#import "MMAppleSMCClient.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
* MMCPUThermalProvider
|
||||
* Samples real-time CPU die, proximity, and per-core temperature sensors from AppleSMC
|
||||
* alongside OS thermal pressure states.
|
||||
*/
|
||||
@interface MMCPUThermalProvider : NSObject <MMTelemetryProvider>
|
||||
|
||||
@property (nonatomic, strong, readonly) MMAppleSMCClient *smcClient;
|
||||
@property (nonatomic, readonly) NSArray<NSString *> *discoveredCoreKeys;
|
||||
@property (nonatomic, readonly, nullable) NSString *packageKey;
|
||||
|
||||
- (instancetype)initWithSMCClient:(MMAppleSMCClient *)client;
|
||||
|
||||
/**
|
||||
* Static calculator method for deterministic unit testing.
|
||||
*/
|
||||
+ (NSDictionary<NSString *, id> *)calculateThermalMetricsWithPackageTemp:(nullable NSNumber *)pkgTemp
|
||||
coreTemps:(NSDictionary<NSString *, NSNumber *> *)coreDict
|
||||
thermalState:(NSProcessInfoThermalState)state;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
#endif /* MMCPUThermalProvider_h */
|
||||
@@ -0,0 +1,151 @@
|
||||
#import "MMCPUThermalProvider.h"
|
||||
#import <sys/sysctl.h>
|
||||
|
||||
@interface MMCPUThermalProvider () {
|
||||
MMAppleSMCClient *_smcClient;
|
||||
NSMutableArray<NSString *> *_discoveredCoreKeys;
|
||||
NSString *_packageKey;
|
||||
BOOL _probed;
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation MMCPUThermalProvider
|
||||
|
||||
- (instancetype)init {
|
||||
return [self initWithSMCClient:[MMAppleSMCClient sharedClient]];
|
||||
}
|
||||
|
||||
- (instancetype)initWithSMCClient:(MMAppleSMCClient *)client {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
_smcClient = client;
|
||||
_discoveredCoreKeys = [NSMutableArray array];
|
||||
[self probeSensors];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)probeSensors {
|
||||
if (!_smcClient.isAvailable) return;
|
||||
|
||||
// Probe package temperature key
|
||||
NSArray<NSString *> *packageCandidates = @[@"TC0P", @"TC0D", @"TC0H", @"TCXC"];
|
||||
for (NSString *candidate in packageCandidates) {
|
||||
NSNumber *val = [_smcClient readNumericValueForKey:candidate error:nil];
|
||||
if (val && [val doubleValue] > 0.0 && [val doubleValue] < 125.0) {
|
||||
_packageKey = candidate;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Probe core keys (TC0C, TC1C, etc.)
|
||||
int coreCount = 1;
|
||||
size_t size = sizeof(coreCount);
|
||||
sysctlbyname("hw.physicalcpu", &coreCount, &size, NULL, 0);
|
||||
if (coreCount <= 0) coreCount = 4;
|
||||
|
||||
for (int i = 0; i < coreCount && i < 32; i++) {
|
||||
NSString *key = [NSString stringWithFormat:@"TC%dC", i];
|
||||
NSNumber *val = [_smcClient readNumericValueForKey:key error:nil];
|
||||
if (val && [val doubleValue] > 0.0 && [val doubleValue] < 125.0) {
|
||||
[_discoveredCoreKeys addObject:key];
|
||||
}
|
||||
}
|
||||
|
||||
_probed = YES;
|
||||
}
|
||||
|
||||
- (MMTelemetryDomain)domain {
|
||||
return MMTelemetryDomainThermal;
|
||||
}
|
||||
|
||||
- (NSString *)providerIdentifier {
|
||||
return @"com.i3omb.macmonitor.telemetry.thermal.cpu";
|
||||
}
|
||||
|
||||
- (BOOL)isAvailable {
|
||||
return _smcClient.isAvailable;
|
||||
}
|
||||
|
||||
- (MMAppleSMCClient *)smcClient {
|
||||
return _smcClient;
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)discoveredCoreKeys {
|
||||
return [_discoveredCoreKeys copy];
|
||||
}
|
||||
|
||||
- (NSString *)packageKey {
|
||||
return _packageKey;
|
||||
}
|
||||
|
||||
+ (NSDictionary<NSString *, id> *)calculateThermalMetricsWithPackageTemp:(nullable NSNumber *)pkgTemp
|
||||
coreTemps:(NSDictionary<NSString *, NSNumber *> *)coreDict
|
||||
thermalState:(NSProcessInfoThermalState)state {
|
||||
double peak = pkgTemp ? [pkgTemp doubleValue] : 0.0;
|
||||
double sum = 0.0;
|
||||
int count = 0;
|
||||
|
||||
NSMutableArray<NSDictionary<NSString *, id> *> *coresList = [NSMutableArray arrayWithCapacity:coreDict.count];
|
||||
NSArray<NSString *> *sortedKeys = [coreDict.allKeys sortedArrayUsingSelector:@selector(compare:)];
|
||||
|
||||
for (NSUInteger idx = 0; idx < sortedKeys.count; idx++) {
|
||||
NSString *k = sortedKeys[idx];
|
||||
double temp = [coreDict[k] doubleValue];
|
||||
if (temp > peak) peak = temp;
|
||||
sum += temp;
|
||||
count++;
|
||||
|
||||
[coresList addObject:@{
|
||||
@"coreIndex": @(idx),
|
||||
@"key": k,
|
||||
@"temperature": @(temp)
|
||||
}];
|
||||
}
|
||||
|
||||
double avg = (count > 0) ? (sum / count) : (pkgTemp ? [pkgTemp doubleValue] : 0.0);
|
||||
|
||||
NSString *stateStr = @"Nominal";
|
||||
switch (state) {
|
||||
case NSProcessInfoThermalStateNominal: stateStr = @"Nominal"; break;
|
||||
case NSProcessInfoThermalStateFair: stateStr = @"Fair"; break;
|
||||
case NSProcessInfoThermalStateSerious: stateStr = @"Serious"; break;
|
||||
case NSProcessInfoThermalStateCritical: stateStr = @"Critical"; break;
|
||||
}
|
||||
|
||||
return @{
|
||||
@"packageTemperature": pkgTemp ?: @(0.0),
|
||||
@"averageCoreTemperature": @(avg),
|
||||
@"peakCoreTemperature": @(peak),
|
||||
@"coreTemperatures": coresList,
|
||||
@"thermalPressureState": stateStr,
|
||||
@"isThrottling": @(state >= NSProcessInfoThermalStateSerious)
|
||||
};
|
||||
}
|
||||
|
||||
- (nullable NSDictionary<NSString *, id> *)sampleTelemetryWithError:(NSError **)error {
|
||||
if (!_probed && _smcClient.isAvailable) {
|
||||
[self probeSensors];
|
||||
}
|
||||
|
||||
NSNumber *pkgTemp = nil;
|
||||
if (_packageKey) {
|
||||
pkgTemp = [_smcClient readNumericValueForKey:_packageKey error:nil];
|
||||
}
|
||||
|
||||
NSMutableDictionary<NSString *, NSNumber *> *coreTemps = [NSMutableDictionary dictionary];
|
||||
for (NSString *coreKey in _discoveredCoreKeys) {
|
||||
NSNumber *t = [_smcClient readNumericValueForKey:coreKey error:nil];
|
||||
if (t) {
|
||||
coreTemps[coreKey] = t;
|
||||
}
|
||||
}
|
||||
|
||||
NSProcessInfoThermalState thermalState = [NSProcessInfo processInfo].thermalState;
|
||||
|
||||
return [MMCPUThermalProvider calculateThermalMetricsWithPackageTemp:pkgTemp
|
||||
coreTemps:coreTemps
|
||||
thermalState:thermalState];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -0,0 +1,42 @@
|
||||
#ifndef MMComponentThermalProvider_h
|
||||
#define MMComponentThermalProvider_h
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "MMTelemetryProvider.h"
|
||||
#import "MMAppleSMCClient.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
* MMComponentThermalProvider
|
||||
* Samples motherboard, PCH chipset, heatsink, memory, and enclosure ambient temperatures
|
||||
* via AppleSMC.
|
||||
*/
|
||||
@interface MMComponentThermalProvider : NSObject <MMTelemetryProvider>
|
||||
|
||||
@property (nonatomic, strong, readonly) MMAppleSMCClient *smcClient;
|
||||
@property (nonatomic, readonly) NSArray<NSString *> *discoveredKeys;
|
||||
|
||||
- (instancetype)init;
|
||||
- (instancetype)initWithSMCClient:(MMAppleSMCClient *)client;
|
||||
|
||||
/**
|
||||
* Categorize SMC temperature key into component domain (e.g., PCH / Chipset, Heatsink, Memory, etc.)
|
||||
*/
|
||||
+ (NSString *)categoryForKey:(NSString *)key;
|
||||
|
||||
/**
|
||||
* Human-readable friendly name for known component SMC keys.
|
||||
*/
|
||||
+ (NSString *)humanReadableNameForKey:(NSString *)key;
|
||||
|
||||
/**
|
||||
* Static calculator method for deterministic unit testing.
|
||||
*/
|
||||
+ (NSDictionary<NSString *, id> *)calculateComponentMetricsFromDictionary:(NSDictionary<NSString *, NSNumber *> *)readings;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
#endif /* MMComponentThermalProvider_h */
|
||||
@@ -0,0 +1,174 @@
|
||||
#import "MMComponentThermalProvider.h"
|
||||
|
||||
@interface MMComponentThermalProvider () {
|
||||
MMAppleSMCClient *_smcClient;
|
||||
NSMutableArray<NSString *> *_discoveredKeys;
|
||||
BOOL _probed;
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation MMComponentThermalProvider
|
||||
|
||||
- (instancetype)init {
|
||||
return [self initWithSMCClient:[MMAppleSMCClient sharedClient]];
|
||||
}
|
||||
|
||||
- (instancetype)initWithSMCClient:(MMAppleSMCClient *)client {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
_smcClient = client;
|
||||
_discoveredKeys = [NSMutableArray array];
|
||||
[self probeSensors];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)probeSensors {
|
||||
if (!_smcClient.isAvailable) return;
|
||||
|
||||
NSArray<NSString *> *candidates = @[
|
||||
@"TPCD", @"TP0P", @"TP0D",
|
||||
@"Th0H", @"Th1H", @"Th2H", @"Th3H",
|
||||
@"TM0P", @"TM1P", @"TM2P", @"TM3P", @"TM0S", @"TM1S",
|
||||
@"Tp0P", @"Tp1P", @"Tp2P", @"Tp0C",
|
||||
@"TA0P", @"TA1P", @"TA0S", @"TA1S",
|
||||
@"TTLD", @"TT1D", @"TB0T", @"TB1T"
|
||||
];
|
||||
|
||||
[_discoveredKeys removeAllObjects];
|
||||
for (NSString *key in candidates) {
|
||||
NSNumber *val = [_smcClient readNumericValueForKey:key error:nil];
|
||||
if (val && [val doubleValue] > 0.0 && [val doubleValue] < 125.0) {
|
||||
[_discoveredKeys addObject:key];
|
||||
}
|
||||
}
|
||||
|
||||
_probed = YES;
|
||||
}
|
||||
|
||||
- (MMTelemetryDomain)domain {
|
||||
return MMTelemetryDomainThermal;
|
||||
}
|
||||
|
||||
- (NSString *)providerIdentifier {
|
||||
return @"com.i3omb.macmonitor.telemetry.thermal.components";
|
||||
}
|
||||
|
||||
- (BOOL)isAvailable {
|
||||
return _smcClient.isAvailable;
|
||||
}
|
||||
|
||||
- (MMAppleSMCClient *)smcClient {
|
||||
return _smcClient;
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)discoveredKeys {
|
||||
return [_discoveredKeys copy];
|
||||
}
|
||||
|
||||
+ (NSString *)categoryForKey:(NSString *)key {
|
||||
if ([key hasPrefix:@"TP"]) return @"PCH / Chipset";
|
||||
if ([key hasPrefix:@"Th"]) return @"Heatsink";
|
||||
if ([key hasPrefix:@"TM"]) return @"Memory";
|
||||
if ([key hasPrefix:@"Tp"]) return @"Power Supply";
|
||||
if ([key hasPrefix:@"TA"]) return @"Ambient / Enclosure";
|
||||
if ([key hasPrefix:@"TT"] || [key hasPrefix:@"TB"] || [key hasPrefix:@"TI"]) return @"Thunderbolt / IO";
|
||||
return @"Other";
|
||||
}
|
||||
|
||||
+ (NSString *)humanReadableNameForKey:(NSString *)key {
|
||||
static NSDictionary<NSString *, NSString *> *names = nil;
|
||||
static dispatch_once_t onceToken;
|
||||
dispatch_once(&onceToken, ^{
|
||||
names = @{
|
||||
@"TPCD": @"Platform Controller Hub (Die)",
|
||||
@"TP0P": @"Platform Controller Hub (Proximity)",
|
||||
@"TP0D": @"Platform Controller Hub (Die Alternate)",
|
||||
@"Th0H": @"Main Heatsink A",
|
||||
@"Th1H": @"Main Heatsink B",
|
||||
@"Th2H": @"Main Heatsink C",
|
||||
@"Th3H": @"Main Heatsink D",
|
||||
@"TM0P": @"Memory Bank 0 Proximity",
|
||||
@"TM1P": @"Memory Bank 1 Proximity",
|
||||
@"TM2P": @"Memory Bank 2 Proximity",
|
||||
@"TM3P": @"Memory Bank 3 Proximity",
|
||||
@"TM0S": @"Memory Module 0",
|
||||
@"TM1S": @"Memory Module 1",
|
||||
@"Tp0P": @"Power Supply Primary",
|
||||
@"Tp1P": @"Power Supply Secondary",
|
||||
@"Tp2P": @"Power Supply Tertiary",
|
||||
@"Tp0C": @"Power Supply Core",
|
||||
@"TA0P": @"Ambient Air Intake",
|
||||
@"TA1P": @"Ambient Air Exhaust",
|
||||
@"TA0S": @"Ambient Air Enclosure",
|
||||
@"TA1S": @"Ambient Air Secondary",
|
||||
@"TTLD": @"Thunderbolt Controller Die",
|
||||
@"TT1D": @"Thunderbolt Controller Secondary",
|
||||
@"TB0T": @"Thunderbolt Port 0",
|
||||
@"TB1T": @"Thunderbolt Port 1"
|
||||
};
|
||||
});
|
||||
|
||||
NSString *match = names[key];
|
||||
return match ?: key;
|
||||
}
|
||||
|
||||
+ (NSDictionary<NSString *, id> *)calculateComponentMetricsFromDictionary:(NSDictionary<NSString *, NSNumber *> *)readings {
|
||||
NSMutableArray<NSDictionary<NSString *, id> *> *components = [NSMutableArray arrayWithCapacity:readings.count];
|
||||
NSMutableDictionary<NSString *, NSMutableArray<NSDictionary<NSString *, id> *> *> *categorized = [NSMutableDictionary dictionary];
|
||||
|
||||
NSArray<NSString *> *sortedKeys = [readings.allKeys sortedArrayUsingSelector:@selector(compare:)];
|
||||
double peak = 0.0;
|
||||
double sum = 0.0;
|
||||
|
||||
for (NSString *k in sortedKeys) {
|
||||
double temp = [readings[k] doubleValue];
|
||||
if (temp > peak) peak = temp;
|
||||
sum += temp;
|
||||
|
||||
NSString *cat = [self categoryForKey:k];
|
||||
NSString *name = [self humanReadableNameForKey:k];
|
||||
|
||||
NSDictionary<NSString *, id> *entry = @{
|
||||
@"key": k,
|
||||
@"name": name,
|
||||
@"category": cat,
|
||||
@"temperature": @(temp)
|
||||
};
|
||||
|
||||
[components addObject:entry];
|
||||
|
||||
if (!categorized[cat]) {
|
||||
categorized[cat] = [NSMutableArray array];
|
||||
}
|
||||
[categorized[cat] addObject:entry];
|
||||
}
|
||||
|
||||
double avg = readings.count > 0 ? (sum / (double)readings.count) : 0.0;
|
||||
|
||||
return @{
|
||||
@"components": components,
|
||||
@"categorized": categorized,
|
||||
@"sensorCount": @(readings.count),
|
||||
@"peakTemperature": @(peak),
|
||||
@"averageTemperature": @(avg)
|
||||
};
|
||||
}
|
||||
|
||||
- (nullable NSDictionary<NSString *, id> *)sampleTelemetryWithError:(NSError **)error {
|
||||
if (!_probed && _smcClient.isAvailable) {
|
||||
[self probeSensors];
|
||||
}
|
||||
|
||||
NSMutableDictionary<NSString *, NSNumber *> *readings = [NSMutableDictionary dictionary];
|
||||
for (NSString *key in _discoveredKeys) {
|
||||
NSNumber *temp = [_smcClient readNumericValueForKey:key error:nil];
|
||||
if (temp) {
|
||||
readings[key] = temp;
|
||||
}
|
||||
}
|
||||
|
||||
return [MMComponentThermalProvider calculateComponentMetricsFromDictionary:readings];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -0,0 +1,65 @@
|
||||
import XCTest
|
||||
@testable import MacMonitor
|
||||
|
||||
final class MMCPULoadTests: XCTestCase {
|
||||
|
||||
func testTickDeltaCalculation() {
|
||||
var prevTicks = [processor_cpu_load_info_data_t]()
|
||||
var currTicks = [processor_cpu_load_info_data_t]()
|
||||
|
||||
// Setup mock Core 0: 20% user, 10% system, 70% idle
|
||||
var core0Prev = processor_cpu_load_info_data_t()
|
||||
core0Prev.cpu_ticks.0 = 100 // USER
|
||||
core0Prev.cpu_ticks.1 = 50 // SYSTEM
|
||||
core0Prev.cpu_ticks.2 = 850 // IDLE
|
||||
core0Prev.cpu_ticks.3 = 0 // NICE
|
||||
prevTicks.append(core0Prev)
|
||||
|
||||
var core0Curr = processor_cpu_load_info_data_t()
|
||||
core0Curr.cpu_ticks.0 = 300 // USER (+200)
|
||||
core0Curr.cpu_ticks.1 = 150 // SYSTEM (+100)
|
||||
core0Curr.cpu_ticks.2 = 1550 // IDLE (+700)
|
||||
core0Curr.cpu_ticks.3 = 0 // NICE (+0)
|
||||
currTicks.append(core0Curr)
|
||||
|
||||
prevTicks.withUnsafeBufferPointer { prevBuf in
|
||||
currTicks.withUnsafeBufferPointer { currBuf in
|
||||
let metrics = MMCPULoadProvider.calculateLoad(
|
||||
fromPreviousTicks: prevBuf.baseAddress,
|
||||
currentTicks: currBuf.baseAddress!,
|
||||
coreCount: 1
|
||||
)
|
||||
|
||||
let totalPct = metrics["totalPercent"] as? Double ?? 0
|
||||
let userPct = metrics["userPercent"] as? Double ?? 0
|
||||
let systemPct = metrics["systemPercent"] as? Double ?? 0
|
||||
let idlePct = metrics["idlePercent"] as? Double ?? 0
|
||||
|
||||
// Total delta = 200 + 100 + 700 = 1000
|
||||
// User = 20%, System = 10%, Idle = 70%, Total Active = 30%
|
||||
XCTAssertEqual(totalPct, 30.0, accuracy: 0.1)
|
||||
XCTAssertEqual(userPct, 20.0, accuracy: 0.1)
|
||||
XCTAssertEqual(systemPct, 10.0, accuracy: 0.1)
|
||||
XCTAssertEqual(idlePct, 70.0, accuracy: 0.1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func testLiveCPULoadProvider() throws {
|
||||
let provider = MMCPULoadProvider()
|
||||
XCTAssertTrue(provider.isAvailable)
|
||||
XCTAssertEqual(provider.domain, .cpu)
|
||||
XCTAssertGreaterThan(provider.coreCount, 0)
|
||||
|
||||
// Initial sample establishes baseline
|
||||
let sample1 = try provider.sampleTelemetry()
|
||||
XCTAssertNotNil(sample1)
|
||||
|
||||
// Second sample produces live deltas
|
||||
usleep(100_000) // 100ms
|
||||
let sample2 = try provider.sampleTelemetry()
|
||||
let cores = sample2["cores"] as? [[String: Any]]
|
||||
XCTAssertNotNil(cores)
|
||||
XCTAssertEqual(cores?.count, Int(provider.coreCount))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
import XCTest
|
||||
@testable import MacMonitor
|
||||
|
||||
final class MMCPUThermalTests: XCTestCase {
|
||||
|
||||
func testThermalMetricsCalculation() {
|
||||
let pkgTemp = NSNumber(value: 55.0)
|
||||
let coreDict: [String: NSNumber] = [
|
||||
"TC0C": NSNumber(value: 52.0),
|
||||
"TC1C": NSNumber(value: 56.0),
|
||||
"TC2C": NSNumber(value: 54.0),
|
||||
"TC3C": NSNumber(value: 58.0)
|
||||
]
|
||||
|
||||
let metrics = MMCPUThermalProvider.calculateThermalMetrics(
|
||||
withPackageTemp: pkgTemp,
|
||||
coreTemps: coreDict,
|
||||
thermalState: .nominal
|
||||
)
|
||||
|
||||
let peak = metrics["peakCoreTemperature"] as? Double ?? 0
|
||||
let avg = metrics["averageCoreTemperature"] as? Double ?? 0
|
||||
let state = metrics["thermalPressureState"] as? String ?? ""
|
||||
let isThrottling = metrics["isThrottling"] as? Bool ?? true
|
||||
|
||||
XCTAssertEqual(peak, 58.0, accuracy: 0.1)
|
||||
XCTAssertEqual(avg, 55.0, accuracy: 0.1)
|
||||
XCTAssertEqual(state, "Nominal")
|
||||
XCTAssertFalse(isThrottling)
|
||||
}
|
||||
|
||||
func testThermalThrottlingDetection() {
|
||||
let metrics = MMCPUThermalProvider.calculateThermalMetrics(
|
||||
withPackageTemp: NSNumber(value: 99.0),
|
||||
coreTemps: [:],
|
||||
thermalState: .serious
|
||||
)
|
||||
|
||||
let isThrottling = metrics["isThrottling"] as? Bool ?? false
|
||||
let state = metrics["thermalPressureState"] as? String ?? ""
|
||||
|
||||
XCTAssertTrue(isThrottling)
|
||||
XCTAssertEqual(state, "Serious")
|
||||
}
|
||||
|
||||
func testLiveCPUThermalProvider() throws {
|
||||
let provider = MMCPUThermalProvider()
|
||||
XCTAssertEqual(provider.domain, .thermal)
|
||||
|
||||
let sample = try provider.sampleTelemetry()
|
||||
XCTAssertNotNil(sample)
|
||||
XCTAssertNotNil(sample["thermalPressureState"])
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
import XCTest
|
||||
@testable import MacMonitor
|
||||
|
||||
final class MMComponentThermalTests: XCTestCase {
|
||||
|
||||
func testCategoryClassification() {
|
||||
XCTAssertEqual(MMComponentThermalProvider.category(forKey: "TPCD"), "PCH / Chipset")
|
||||
XCTAssertEqual(MMComponentThermalProvider.category(forKey: "TP0P"), "PCH / Chipset")
|
||||
XCTAssertEqual(MMComponentThermalProvider.category(forKey: "Th0H"), "Heatsink")
|
||||
XCTAssertEqual(MMComponentThermalProvider.category(forKey: "Th1H"), "Heatsink")
|
||||
XCTAssertEqual(MMComponentThermalProvider.category(forKey: "TM0P"), "Memory")
|
||||
XCTAssertEqual(MMComponentThermalProvider.category(forKey: "TM1S"), "Memory")
|
||||
XCTAssertEqual(MMComponentThermalProvider.category(forKey: "Tp0P"), "Power Supply")
|
||||
XCTAssertEqual(MMComponentThermalProvider.category(forKey: "TA0P"), "Ambient / Enclosure")
|
||||
XCTAssertEqual(MMComponentThermalProvider.category(forKey: "TTLD"), "Thunderbolt / IO")
|
||||
XCTAssertEqual(MMComponentThermalProvider.category(forKey: "TB0T"), "Thunderbolt / IO")
|
||||
XCTAssertEqual(MMComponentThermalProvider.category(forKey: "ZZ99"), "Other")
|
||||
}
|
||||
|
||||
func testHumanReadableNames() {
|
||||
XCTAssertEqual(MMComponentThermalProvider.humanReadableName(forKey: "TPCD"), "Platform Controller Hub (Die)")
|
||||
XCTAssertEqual(MMComponentThermalProvider.humanReadableName(forKey: "Th0H"), "Main Heatsink A")
|
||||
XCTAssertEqual(MMComponentThermalProvider.humanReadableName(forKey: "TA0P"), "Ambient Air Intake")
|
||||
XCTAssertEqual(MMComponentThermalProvider.humanReadableName(forKey: "CUSTOM"), "CUSTOM")
|
||||
}
|
||||
|
||||
func testComponentMetricsCalculation() {
|
||||
let readings: [String: NSNumber] = [
|
||||
"TPCD": NSNumber(value: 65.5),
|
||||
"Th0H": NSNumber(value: 48.0),
|
||||
"TM0P": NSNumber(value: 42.0),
|
||||
"TA0P": NSNumber(value: 28.5)
|
||||
]
|
||||
|
||||
let metrics = MMComponentThermalProvider.calculateComponentMetrics(from: readings)
|
||||
|
||||
let peak = metrics["peakTemperature"] as? Double ?? 0
|
||||
let avg = metrics["averageTemperature"] as? Double ?? 0
|
||||
let count = metrics["sensorCount"] as? Int ?? 0
|
||||
let components = metrics["components"] as? [[String: Any]] ?? []
|
||||
let categorized = metrics["categorized"] as? [String: [[String: Any]]] ?? [:]
|
||||
|
||||
XCTAssertEqual(peak, 65.5, accuracy: 0.1)
|
||||
XCTAssertEqual(avg, (65.5 + 48.0 + 42.0 + 28.5) / 4.0, accuracy: 0.1)
|
||||
XCTAssertEqual(count, 4)
|
||||
XCTAssertEqual(components.count, 4)
|
||||
|
||||
let pchList = categorized["PCH / Chipset"]
|
||||
XCTAssertNotNil(pchList)
|
||||
let firstPchName = pchList?.first?["name"] as? String
|
||||
XCTAssertEqual(firstPchName, "Platform Controller Hub (Die)")
|
||||
XCTAssertEqual(categorized["Heatsink"]?.count, 1)
|
||||
XCTAssertEqual(categorized["Memory"]?.count, 1)
|
||||
XCTAssertEqual(categorized["Ambient / Enclosure"]?.count, 1)
|
||||
}
|
||||
|
||||
func testEmptyReadingsCalculation() {
|
||||
let metrics = MMComponentThermalProvider.calculateComponentMetrics(from: [:])
|
||||
|
||||
let peak = metrics["peakTemperature"] as? Double ?? -1
|
||||
let avg = metrics["averageTemperature"] as? Double ?? -1
|
||||
let count = metrics["sensorCount"] as? Int ?? -1
|
||||
|
||||
XCTAssertEqual(peak, 0.0)
|
||||
XCTAssertEqual(avg, 0.0)
|
||||
XCTAssertEqual(count, 0)
|
||||
}
|
||||
|
||||
func testLiveComponentThermalProvider() throws {
|
||||
let provider = MMComponentThermalProvider()
|
||||
XCTAssertEqual(provider.domain, .thermal)
|
||||
XCTAssertEqual(provider.providerIdentifier, "com.i3omb.macmonitor.telemetry.thermal.components")
|
||||
|
||||
let sample = try provider.sampleTelemetry()
|
||||
XCTAssertNotNil(sample)
|
||||
XCTAssertNotNil(sample["sensorCount"])
|
||||
XCTAssertNotNil(sample["components"])
|
||||
XCTAssertNotNil(sample["categorized"])
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
import XCTest
|
||||
@testable import MacMonitor
|
||||
|
||||
final class MMFanTests: XCTestCase {
|
||||
|
||||
func testFanUtilizationCalculation() {
|
||||
let fanList: [[String: NSNumber]] = [
|
||||
[
|
||||
"currentRPM": NSNumber(value: 2000.0),
|
||||
"minRPM": NSNumber(value: 1200.0),
|
||||
"maxRPM": NSNumber(value: 5000.0),
|
||||
"targetRPM": NSNumber(value: 2000.0)
|
||||
],
|
||||
[
|
||||
"currentRPM": NSNumber(value: 2500.0),
|
||||
"minRPM": NSNumber(value: 1200.0),
|
||||
"maxRPM": NSNumber(value: 5000.0),
|
||||
"targetRPM": NSNumber(value: 2500.0)
|
||||
]
|
||||
]
|
||||
|
||||
let metrics = MMFanTelemetryProvider.calculateFanMetrics(fromFanList: fanList)
|
||||
|
||||
let count = metrics["fanCount"] as? Int ?? 0
|
||||
let avgRPM = metrics["averageRPM"] as? Double ?? 0
|
||||
let peakRPM = metrics["peakRPM"] as? Double ?? 0
|
||||
let fans = metrics["fans"] as? [[String: Any]] ?? []
|
||||
|
||||
XCTAssertEqual(count, 2)
|
||||
XCTAssertEqual(avgRPM, 2250.0, accuracy: 0.1)
|
||||
XCTAssertEqual(peakRPM, 2500.0, accuracy: 0.1)
|
||||
XCTAssertEqual(fans.count, 2)
|
||||
|
||||
let fan0 = fans[0]
|
||||
let util0 = fan0["utilizationPercent"] as? Double ?? 0
|
||||
// (2000 - 1200) / 3800 * 100 = 21.05%
|
||||
XCTAssertEqual(util0, 21.05, accuracy: 0.1)
|
||||
}
|
||||
|
||||
func testLiveFanProvider() throws {
|
||||
let provider = MMFanTelemetryProvider()
|
||||
XCTAssertEqual(provider.domain, .fan)
|
||||
|
||||
let sample = try provider.sampleTelemetry()
|
||||
XCTAssertNotNil(sample)
|
||||
XCTAssertNotNil(sample["fanCount"])
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
import XCTest
|
||||
@testable import MacMonitor
|
||||
|
||||
final class MMMemoryTests: XCTestCase {
|
||||
|
||||
func testMemoryMetricCalculation() {
|
||||
var vmInfo = vm_statistics64_data_t()
|
||||
let pageSize: vm_size_t = 4096
|
||||
let totalRAM: UInt64 = 16 * 1024 * 1024 * 1024 // 16 GB
|
||||
|
||||
// 1GB wired (262144 pages), 2GB app (524288 pages), 1GB compressed (262144 pages)
|
||||
vmInfo.wire_count = 262_144
|
||||
vmInfo.internal_page_count = 524_288
|
||||
vmInfo.purgeable_count = 0
|
||||
vmInfo.compressor_page_count = 262_144
|
||||
vmInfo.active_count = 524_288
|
||||
vmInfo.inactive_count = 1_048_576 // 4GB
|
||||
vmInfo.free_count = 2_097_152 // 8GB
|
||||
|
||||
var swap = xsw_usage()
|
||||
swap.xsu_total = 2 * 1024 * 1024 * 1024
|
||||
swap.xsu_used = 512 * 1024 * 1024
|
||||
swap.xsu_avail = swap.xsu_total - swap.xsu_used
|
||||
|
||||
withUnsafePointer(to: vmInfo) { vmPtr in
|
||||
withUnsafePointer(to: swap) { swapPtr in
|
||||
let metrics = MMMemoryTelemetryProvider.calculateMemoryMetrics(
|
||||
withVMInfo: vmPtr,
|
||||
pageSize: pageSize,
|
||||
totalPhysicalRAM: totalRAM,
|
||||
swapUsage: swapPtr
|
||||
)
|
||||
|
||||
let wired = metrics["wiredBytes"] as? UInt64 ?? 0
|
||||
let app = metrics["appMemoryBytes"] as? UInt64 ?? 0
|
||||
let compressed = metrics["compressedBytes"] as? UInt64 ?? 0
|
||||
let used = metrics["usedBytes"] as? UInt64 ?? 0
|
||||
let pressureStatus = metrics["memoryPressureStatus"] as? String ?? ""
|
||||
|
||||
XCTAssertEqual(wired, 1024 * 1024 * 1024)
|
||||
XCTAssertEqual(app, 2 * 1024 * 1024 * 1024)
|
||||
XCTAssertEqual(compressed, 1024 * 1024 * 1024)
|
||||
XCTAssertEqual(used, 4 * 1024 * 1024 * 1024)
|
||||
XCTAssertEqual(pressureStatus, "Normal")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func testLiveMemoryProvider() throws {
|
||||
let provider = MMMemoryTelemetryProvider()
|
||||
XCTAssertTrue(provider.isAvailable)
|
||||
XCTAssertEqual(provider.domain, .memory)
|
||||
XCTAssertGreaterThan(provider.totalPhysicalMemoryBytes, 0)
|
||||
|
||||
let sample = try provider.sampleTelemetry()
|
||||
let total = sample["totalBytes"] as? UInt64 ?? 0
|
||||
let used = sample["usedBytes"] as? UInt64 ?? 0
|
||||
let free = sample["freeBytes"] as? UInt64 ?? 0
|
||||
|
||||
XCTAssertGreaterThan(total, 0)
|
||||
XCTAssertGreaterThan(used, 0)
|
||||
XCTAssertGreaterThanOrEqual(free, 0)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
import XCTest
|
||||
@testable import MacMonitor
|
||||
|
||||
final class MMPowerTests: XCTestCase {
|
||||
|
||||
func testUnitsAndNames() {
|
||||
XCTAssertEqual(MMPowerTelemetryProvider.unit(forKey: "PSTR"), "W")
|
||||
XCTAssertEqual(MMPowerTelemetryProvider.unit(forKey: "VC0C"), "V")
|
||||
XCTAssertEqual(MMPowerTelemetryProvider.unit(forKey: "IC0C"), "A")
|
||||
XCTAssertEqual(MMPowerTelemetryProvider.unit(forKey: "UNKNOWN"), "")
|
||||
|
||||
XCTAssertEqual(MMPowerTelemetryProvider.humanReadableName(forKey: "PSTR"), "Total System Power")
|
||||
XCTAssertEqual(MMPowerTelemetryProvider.humanReadableName(forKey: "VC0C"), "CPU Core Voltage")
|
||||
XCTAssertEqual(MMPowerTelemetryProvider.humanReadableName(forKey: "IC0C"), "CPU Core Current")
|
||||
}
|
||||
|
||||
func testPowerMetricsCalculationFromSMC() {
|
||||
let readings: [String: NSNumber] = [
|
||||
"PSTR": NSNumber(value: 45.2),
|
||||
"PCPR": NSNumber(value: 28.4),
|
||||
"PG0R": NSNumber(value: 8.5),
|
||||
"PMSR": NSNumber(value: 3.1),
|
||||
"VC0C": NSNumber(value: 1.15),
|
||||
"IC0C": NSNumber(value: 24.5)
|
||||
]
|
||||
|
||||
let batteryInfo: [String: Any] = [
|
||||
"powerSource": "AC Power",
|
||||
"isCharging": false,
|
||||
"batteryLevel": 100.0,
|
||||
"batteryWatts": 0.0
|
||||
]
|
||||
|
||||
let metrics = MMPowerTelemetryProvider.calculatePowerMetrics(
|
||||
withReadings: readings,
|
||||
batteryInfo: batteryInfo
|
||||
)
|
||||
|
||||
let systemWatts = metrics["systemTotalWatts"] as? Double ?? 0
|
||||
let cpuWatts = metrics["cpuWatts"] as? Double ?? 0
|
||||
let gpuWatts = metrics["gpuWatts"] as? Double ?? 0
|
||||
let memWatts = metrics["memoryWatts"] as? Double ?? 0
|
||||
let cpuV = metrics["cpuVoltage"] as? Double ?? 0
|
||||
let cpuI = metrics["cpuCurrent"] as? Double ?? 0
|
||||
let powerSource = metrics["powerSource"] as? String ?? ""
|
||||
let sensors = metrics["sensors"] as? [[String: Any]] ?? []
|
||||
|
||||
XCTAssertEqual(systemWatts, 45.2, accuracy: 0.1)
|
||||
XCTAssertEqual(cpuWatts, 28.4, accuracy: 0.1)
|
||||
XCTAssertEqual(gpuWatts, 8.5, accuracy: 0.1)
|
||||
XCTAssertEqual(memWatts, 3.1, accuracy: 0.1)
|
||||
XCTAssertEqual(cpuV, 1.15, accuracy: 0.01)
|
||||
XCTAssertEqual(cpuI, 24.5, accuracy: 0.1)
|
||||
XCTAssertEqual(powerSource, "AC Power")
|
||||
XCTAssertEqual(sensors.count, 6)
|
||||
}
|
||||
|
||||
func testBatteryFallbackCalculation() {
|
||||
// No PSTR, no PCPR, but VC0C and IC0C are present
|
||||
let readings: [String: NSNumber] = [
|
||||
"VC0C": NSNumber(value: 1.2),
|
||||
"IC0C": NSNumber(value: 10.0)
|
||||
]
|
||||
|
||||
let batteryInfo: [String: Any] = [
|
||||
"powerSource": "Battery Power",
|
||||
"isCharging": false,
|
||||
"batteryLevel": 75.0,
|
||||
"batteryWatts": 18.5
|
||||
]
|
||||
|
||||
let metrics = MMPowerTelemetryProvider.calculatePowerMetrics(
|
||||
withReadings: readings,
|
||||
batteryInfo: batteryInfo
|
||||
)
|
||||
|
||||
let systemWatts = metrics["systemTotalWatts"] as? Double ?? 0
|
||||
let cpuWatts = metrics["cpuWatts"] as? Double ?? 0
|
||||
let powerSource = metrics["powerSource"] as? String ?? ""
|
||||
let isCharging = metrics["isCharging"] as? Bool ?? true
|
||||
|
||||
// System watts falls back to batteryWatts (18.5)
|
||||
XCTAssertEqual(systemWatts, 18.5, accuracy: 0.1)
|
||||
// CPU watts calculated from V * I = 1.2 * 10.0 = 12.0 W
|
||||
XCTAssertEqual(cpuWatts, 12.0, accuracy: 0.1)
|
||||
XCTAssertEqual(powerSource, "Battery Power")
|
||||
XCTAssertFalse(isCharging)
|
||||
}
|
||||
|
||||
func testLivePowerProvider() throws {
|
||||
let provider = MMPowerTelemetryProvider()
|
||||
XCTAssertEqual(provider.domain, .power)
|
||||
XCTAssertEqual(provider.providerIdentifier, "com.i3omb.macmonitor.telemetry.power")
|
||||
|
||||
let sample = try provider.sampleTelemetry()
|
||||
XCTAssertNotNil(sample)
|
||||
XCTAssertNotNil(sample["systemTotalWatts"])
|
||||
XCTAssertNotNil(sample["powerSource"])
|
||||
XCTAssertNotNil(sample["sensors"])
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
import XCTest
|
||||
@testable import MacMonitor
|
||||
|
||||
final class MMStorageTests: XCTestCase {
|
||||
|
||||
func testStatFSBufferParsing() {
|
||||
var stat = statfs()
|
||||
stat.f_bsize = 4096
|
||||
stat.f_blocks = 125_000_000 // 500 GB
|
||||
stat.f_bfree = 50_000_000 // 200 GB
|
||||
stat.f_bavail = 45_000_000
|
||||
stat.f_flags = UInt32(MNT_LOCAL)
|
||||
|
||||
let mountPath = "/Volumes/External"
|
||||
let devicePath = "/dev/disk2s1"
|
||||
let fsType = "apfs"
|
||||
|
||||
_ = mountPath.withCString { mntPtr in
|
||||
strncpy(&stat.f_mntonname.0, mntPtr, Int(MNAMELEN))
|
||||
}
|
||||
_ = devicePath.withCString { devPtr in
|
||||
strncpy(&stat.f_mntfromname.0, devPtr, Int(MNAMELEN))
|
||||
}
|
||||
_ = fsType.withCString { fsPtr in
|
||||
strncpy(&stat.f_fstypename.0, fsPtr, Int(MFSTYPENAMELEN))
|
||||
}
|
||||
|
||||
withUnsafePointer(to: stat) { ptr in
|
||||
let volumes = MMStorageTelemetryProvider.parseStatFSBuffer(ptr, count: 1)
|
||||
XCTAssertEqual(volumes.count, 1)
|
||||
|
||||
let vol = volumes.first!
|
||||
XCTAssertEqual(vol["volumeName"] as? String, "External")
|
||||
XCTAssertEqual(vol["mountPoint"] as? String, "/Volumes/External")
|
||||
XCTAssertEqual(vol["devicePath"] as? String, "/dev/disk2s1")
|
||||
XCTAssertEqual(vol["fsType"] as? String, "apfs")
|
||||
|
||||
let total = vol["totalBytes"] as? UInt64 ?? 0
|
||||
let free = vol["freeBytes"] as? UInt64 ?? 0
|
||||
let used = vol["usedBytes"] as? UInt64 ?? 0
|
||||
let pct = vol["usedPercent"] as? Double ?? 0
|
||||
|
||||
XCTAssertEqual(total, 512_000_000_000)
|
||||
XCTAssertEqual(free, 204_800_000_000)
|
||||
XCTAssertEqual(used, 307_200_000_000)
|
||||
XCTAssertEqual(pct, 60.0, accuracy: 0.1)
|
||||
}
|
||||
}
|
||||
|
||||
func testLiveStorageProvider() throws {
|
||||
let provider = MMStorageTelemetryProvider()
|
||||
XCTAssertTrue(provider.isAvailable)
|
||||
XCTAssertEqual(provider.domain, .storage)
|
||||
|
||||
let sample = try provider.sampleTelemetry()
|
||||
let volumes = sample["volumes"] as? [[String: Any]]
|
||||
XCTAssertNotNil(volumes)
|
||||
XCTAssertGreaterThan(volumes?.count ?? 0, 0)
|
||||
|
||||
let firstVol = volumes?.first
|
||||
XCTAssertNotNil(firstVol?["mountPoint"])
|
||||
XCTAssertGreaterThan(firstVol?["totalBytes"] as? UInt64 ?? 0, 0)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user