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

fix: removed scheduler and speed limits for Apple Silicon (#749)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2022-01-14 20:31:16 +01:00
parent 8d6464419e
commit da08c0f1fc
3 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Kit/types.swift
View File

@@ -204,3 +204,13 @@ public extension Notification.Name {
static let refreshPublicIP = Notification.Name("refreshPublicIP")
static let resetTotalNetworkUsage = Notification.Name("resetTotalNetworkUsage")
}
public var isARM: Bool {
get {
var value = false
#if arch(arm64)
value = true
#endif
return value
}
}

2
Modules/CPU/main.swift
View File

@@ -64,11 +64,11 @@ public class CPU: Module {
self.loadReader = LoadReader()
self.processReader = ProcessReader()
self.limitReader = LimitReader(popup: true)
self.averageReader = AverageReader(popup: true)
self.temperatureReader = TemperatureReader(popup: true)
#if arch(x86_64)
self.limitReader = LimitReader(popup: true)
self.frequencyReader = FrequencyReader(popup: true)
#endif

28
Modules/CPU/popup.swift
View File

@@ -19,7 +19,14 @@ internal class Popup: NSView, Popup_p {
private let dashboardHeight: CGFloat = 90
private let chartHeight: CGFloat = 90 + Constants.Popup.separatorHeight
private let detailsHeight: CGFloat = (22*5) + Constants.Popup.separatorHeight
private var detailsHeight: CGFloat {
get {
if isARM {
return (22*3) + Constants.Popup.separatorHeight
}
return (22*5) + Constants.Popup.separatorHeight
}
}
private let averageHeight: CGFloat = (22*3) + Constants.Popup.separatorHeight
private let processHeight: CGFloat = 22
@@ -67,9 +74,9 @@ internal class Popup: NSView, Popup_p {
x: 0,
y: 0,
width: Constants.Popup.width,
height: self.dashboardHeight + self.chartHeight + self.detailsHeight + self.averageHeight
height: self.dashboardHeight + self.chartHeight + self.averageHeight
))
self.setFrameSize(NSSize(width: self.frame.width, height: self.frame.height+self.processesHeight))
self.setFrameSize(NSSize(width: self.frame.width, height: self.frame.height + self.detailsHeight + self.processesHeight))
let gridView: NSGridView = NSGridView(frame: NSRect(x: 0, y: 0, width: self.frame.width, height: self.frame.height))
gridView.rowSpacing = 0
@@ -169,14 +176,21 @@ internal class Popup: NSView, Popup_p {
private func initDetails() -> NSView {
let view: NSView = NSView(frame: NSRect(x: 0, y: 0, width: self.frame.width, height: self.detailsHeight))
let separator = separatorView(localizedString("Details"), origin: NSPoint(x: 0, y: self.detailsHeight-Constants.Popup.separatorHeight), width: self.frame.width)
let container: NSView = NSView(frame: NSRect(x: 0, y: 0, width: self.frame.width, height: separator.frame.origin.y))
let separator = separatorView(localizedString("Details"), origin: NSPoint(
x: 0,
y: self.detailsHeight-Constants.Popup.separatorHeight
), width: self.frame.width)
let container: NSStackView = NSStackView(frame: NSRect(x: 0, y: 0, width: view.frame.width, height: separator.frame.origin.y))
container.orientation = .vertical
container.spacing = 0
self.systemField = popupWithColorRow(container, color: NSColor.systemRed, n: 4, title: "\(localizedString("System")):", value: "")
self.userField = popupWithColorRow(container, color: NSColor.systemBlue, n: 3, title: "\(localizedString("User")):", value: "")
self.idleField = popupWithColorRow(container, color: NSColor.lightGray.withAlphaComponent(0.5), n: 2, title: "\(localizedString("Idle")):", value: "")
self.shedulerLimitField = popupRow(container, n: 1, title: "\(localizedString("Scheduler limit")):", value: "").1
self.speedLimitField = popupRow(container, n: 0, title: "\(localizedString("Speed limit")):", value: "").1
if !isARM {
self.shedulerLimitField = popupRow(container, n: 1, title: "\(localizedString("Scheduler limit")):", value: "").1
self.speedLimitField = popupRow(container, n: 0, title: "\(localizedString("Speed limit")):", value: "").1
}
view.addSubview(separator)
view.addSubview(container)