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: add option to disable CPU frequency (IPG) (#379)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2021-03-12 17:51:29 +01:00
parent 7095f52c30
commit 3b43e91c3d
4 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/CPU/main.swift
View File

@@ -77,6 +77,9 @@ public class CPU: Module {
self.settingsView.setInterval = { [unowned self] value in
self.loadReader?.setInterval(value)
}
self.settingsView.IPGCallback = { [unowned self] value in
self.popupView.toggleFrequency(state: value)
}
self.loadReader?.callbackHandler = { [unowned self] value in
self.loadCallback(value)

9
Modules/CPU/popup.swift
View File

@@ -272,4 +272,13 @@ internal class Popup: NSView, Popup_p {
self.initializedProcesses = true
})
}
public func toggleFrequency(state: Bool) {
DispatchQueue.main.async(execute: {
if let view = self.frequencyCircle {
view.isHidden = !state
}
self.initializedFrequency = false
})
}
}

10
Modules/CPU/readers.swift
View File

@@ -283,12 +283,20 @@ public class FrequencyReader: Reader<Double> {
private var sample: PGSample = 0
private var reconnectAttempt: Int = 0
private var isEnabled: Bool {
get {
return Store.shared.bool(key: "CPU_IPG", defaultValue: false)
}
}
override init() {
super.init()
self.popup = true
}
public override func setup() {
guard self.isEnabled else { return }
let path: CFString = "/Library/Frameworks/IntelPowerGadget.framework" as CFString
let bundleURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path, CFURLPathStyle.cfurlposixPathStyle, true)
@@ -378,7 +386,7 @@ public class FrequencyReader: Reader<Double> {
}
public override func read() {
if self.PG_ReadSample == nil || self.PGSample_GetIAFrequency == nil || self.PGSample_Release == nil {
if !self.isEnabled || self.PG_ReadSample == nil || self.PGSample_GetIAFrequency == nil || self.PGSample_Release == nil {
return
}

38
Modules/CPU/settings.swift
View File

@@ -16,6 +16,7 @@ import ModuleKit
internal class Settings: NSView, Settings_v {
private var usagePerCoreState: Bool = false
private var hyperthreadState: Bool = false
private var IPGState: Bool = false
private var updateIntervalValue: Int = 1
private var numberOfProcesses: Int = 8
@@ -25,6 +26,7 @@ internal class Settings: NSView, Settings_v {
public var callback: (() -> Void) = {}
public var callbackWhenUpdateNumberOfProcesses: (() -> Void) = {}
public var IPGCallback: ((_ state: Bool) -> Void) = {_ in }
public var setInterval: ((_ value: Int) -> Void) = {_ in }
private var hyperthreadView: NSView? = nil
@@ -34,6 +36,7 @@ internal class Settings: NSView, Settings_v {
self.store = store
self.hyperthreadState = store.pointee.bool(key: "\(self.title)_hyperhreading", defaultValue: self.hyperthreadState)
self.usagePerCoreState = store.pointee.bool(key: "\(self.title)_usagePerCore", defaultValue: self.usagePerCoreState)
self.IPGState = store.pointee.bool(key: "\(self.title)_IPG", defaultValue: self.IPGState)
self.updateIntervalValue = store.pointee.int(key: "\(self.title)_updateInterval", defaultValue: self.updateIntervalValue)
self.numberOfProcesses = store.pointee.int(key: "\(self.title)_processes", defaultValue: self.numberOfProcesses)
if !self.usagePerCoreState {
@@ -59,8 +62,19 @@ internal class Settings: NSView, Settings_v {
public func load(widgets: [widget_t]) {
self.subviews.forEach{ $0.removeFromSuperview() }
var hasIPG = false
#if arch(x86_64)
let path: CFString = "/Library/Frameworks/IntelPowerGadget.framework" as CFString
let bundleURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path, CFURLPathStyle.cfurlposixPathStyle, true)
hasIPG = CFBundleCreate(kCFAllocatorDefault, bundleURL) != nil
#endif
let rowHeight: CGFloat = 30
let num: CGFloat = !widgets.filter{ $0 == .barChart }.isEmpty ? self.hasHyperthreadingCores ? 3 : 2 : 1
var num: CGFloat = !widgets.filter{ $0 == .barChart }.isEmpty ? self.hasHyperthreadingCores ? 3 : 2 : 1
if hasIPG {
num += 1
}
self.addSubview(SelectTitleRow(
frame: NSRect(x: Constants.Settings.margin, y: Constants.Settings.margin + (rowHeight + Constants.Settings.margin) * num, width: self.frame.width - (Constants.Settings.margin*2), height: rowHeight),
@@ -93,6 +107,15 @@ internal class Settings: NSView, Settings_v {
}
}
if hasIPG {
self.addSubview(ToggleTitleRow(
frame: NSRect(x: Constants.Settings.margin, y: Constants.Settings.margin + (rowHeight + Constants.Settings.margin) * 1, width: self.frame.width - (Constants.Settings.margin*2), height: rowHeight),
title: "\(LocalizedString("CPU frequency")) (IPG)",
action: #selector(toggleIPG),
state: self.IPGState
))
}
self.addSubview(SelectTitleRow(
frame: NSRect(x: Constants.Settings.margin, y: Constants.Settings.margin, width: self.frame.width - (Constants.Settings.margin*2), height: rowHeight),
title: LocalizedString("Number of top processes"),
@@ -152,4 +175,17 @@ internal class Settings: NSView, Settings_v {
self.store.pointee.set(key: "\(self.title)_hyperhreading", value: self.hyperthreadState)
self.callback()
}
@objc func toggleIPG(_ sender: NSControl) {
var state: NSControl.StateValue? = nil
if #available(OSX 10.15, *) {
state = sender is NSSwitch ? (sender as! NSSwitch).state: nil
} else {
state = sender is NSButton ? (sender as! NSButton).state: nil
}
self.IPGState = state! == .on ? true : false
self.store.pointee.set(key: "\(self.title)_IPG", value: self.IPGState)
self.IPGCallback(self.IPGState)
}
}