morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

feat: added CPU frequency for m4 (#2285)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2025-01-10 22:45:08 +01:00
parent 1a8bd2e657
commit 3e056562b3
4 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Kit/helpers.swift
View File

@@ -663,16 +663,21 @@ internal func getIOName(_ entry: io_registry_entry_t) -> String? {
return String(cString: UnsafeRawPointer(pointer).assumingMemoryBound(to: CChar.self))
}
internal func convertCFDataToArr(_ data: CFData) -> [Int32] {
internal func convertCFDataToArr(_ data: CFData, _ isM4: Bool = false) -> [Int32] {
let length = CFDataGetLength(data)
var bytes = [UInt8](repeating: 0, count: length)
CFDataGetBytes(data, CFRange(location: 0, length: length), &bytes)
var multiplier: UInt32 = 1000 * 1000
if isM4 {
multiplier = 1000
}
var arr: [Int32] = []
var chunks = stride(from: 0, to: bytes.count, by: 8).map { Array(bytes[$0..<min($0 + 8, bytes.count)])}
for chunk in chunks {
let v = UInt32(chunk[0]) | UInt32(chunk[1]) << 8 | UInt32(chunk[2]) << 16 | UInt32(chunk[3]) << 24
arr.append(Int32(v / 1000 / 1000))
arr.append(Int32(v / multiplier))
}
bytes.removeAll()
chunks.removeAll()

115
Kit/plugins/SystemKit.swift
View File

@@ -184,52 +184,7 @@ public class SystemKit {
self.device.info.cpu = self.getCPUInfo()
self.device.info.ram = self.getRamInfo()
self.device.info.gpu = self.getGPUInfo()
if let name = self.device.info.cpu?.name?.lowercased() {
if name.contains("intel") {
self.device.platform = .intel
} else if name.contains("m1") {
if name.contains("pro") {
self.device.platform = .m1Pro
} else if name.contains("max") {
self.device.platform = .m1Max
} else if name.contains("ultra") {
self.device.platform = .m1Ultra
} else {
self.device.platform = .m1
}
} else if name.contains("m2") {
if name.contains("pro") {
self.device.platform = .m2Pro
} else if name.contains("max") {
self.device.platform = .m2Max
} else if name.contains("ultra") {
self.device.platform = .m2Ultra
} else {
self.device.platform = .m2
}
} else if name.contains("m3") {
if name.contains("pro") {
self.device.platform = .m3Pro
} else if name.contains("max") {
self.device.platform = .m3Max
} else if name.contains("ultra") {
self.device.platform = .m3Ultra
} else {
self.device.platform = .m3
}
} else if name.contains("m4") {
if name.contains("pro") {
self.device.platform = .m4Pro
} else if name.contains("max") {
self.device.platform = .m4Max
} else if name.contains("ultra") {
self.device.platform = .m4Ultra
} else {
self.device.platform = .m4
}
}
}
self.device.platform = self.getPlatform()
}
public func getModelID() -> String? {
@@ -322,7 +277,7 @@ public class SystemKit {
cpu.pCores = cores.1
cpu.cores = cores.2
}
if let freq = getFrequencies() {
if let freq = getFrequencies(cpuName: cpu.name ?? "") {
cpu.eCoreFrequencies = freq.0
cpu.pCoreFrequencies = freq.1
}
@@ -422,10 +377,6 @@ public class SystemKit {
gpu.vram = vram
}
if let freq = getFrequencies() {
gpu.frequencies = freq.2
}
list.append(gpu)
}
}
@@ -438,34 +389,31 @@ public class SystemKit {
return list
}
private func getFrequencies() -> ([Int32], [Int32], [Int32])? {
private func getFrequencies(cpuName: String) -> ([Int32], [Int32])? {
var iterator = io_iterator_t()
let result = IOServiceGetMatchingServices(kIOMasterPortDefault, IOServiceMatching("AppleARMIODevice"), &iterator)
if result != kIOReturnSuccess {
print("Error find AppleARMIODevice: " + (String(cString: mach_error_string(result), encoding: String.Encoding.ascii) ?? "unknown error"))
return nil
}
let isM4: Bool = cpuName.lowercased().contains("m4")
var eFreq: [Int32] = []
var pFreq: [Int32] = []
var gpuFreq: [Int32] = []
while case let child = IOIteratorNext(iterator), child != 0 {
defer { IOObjectRelease(child) }
guard let name = getIOName(child), name == "pmgr", let props = getIOProperties(child) else { continue }
if let data = props.value(forKey: "voltage-states1-sram") {
eFreq = convertCFDataToArr(data as! CFData)
eFreq = convertCFDataToArr(data as! CFData, isM4)
}
if let data = props.value(forKey: "voltage-states5-sram") {
pFreq = convertCFDataToArr(data as! CFData)
}
if let data = props.value(forKey: "voltage-states9-sram") {
gpuFreq = convertCFDataToArr(data as! CFData)
pFreq = convertCFDataToArr(data as! CFData, isM4)
}
}
return (eFreq, pFreq, gpuFreq)
return (eFreq, pFreq)
}
public func getRamInfo() -> ram_s? {
@@ -584,6 +532,55 @@ public class SystemKit {
return nil
}
private func getPlatform() -> Platform? {
if let name = self.device.info.cpu?.name?.lowercased() {
if name.contains("intel") {
return .intel
} else if name.contains("m1") {
if name.contains("pro") {
return .m1Pro
} else if name.contains("max") {
return .m1Max
} else if name.contains("ultra") {
return .m1Ultra
} else {
return .m1
}
} else if name.contains("m2") {
if name.contains("pro") {
return .m2Pro
} else if name.contains("max") {
return .m2Max
} else if name.contains("ultra") {
return .m2Ultra
} else {
return .m2
}
} else if name.contains("m3") {
if name.contains("pro") {
return .m3Pro
} else if name.contains("max") {
return .m3Max
} else if name.contains("ultra") {
return .m3Ultra
} else {
return .m3
}
} else if name.contains("m4") {
if name.contains("pro") {
return .m4Pro
} else if name.contains("max") {
return .m4Max
} else if name.contains("ultra") {
return .m4Ultra
} else {
return .m4
}
}
}
return nil
}
}
let deviceDict: [String: model_s] = [

2
Stats/Supporting Files/Info.plist
View File

@@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>651</string>
<string>656</string>
<key>Description</key>
<string>Simple macOS system monitor in your menu bar</string>
<key>LSApplicationCategoryType</key>

2
Widgets/Supporting Files/Info.plist
View File

@@ -13,7 +13,7 @@
<key>CFBundleShortVersionString</key>
<string>2.11.23</string>
<key>CFBundleVersion</key>
<string>651</string>
<string>656</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>