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

- added RAM pressure to BarChart widget

Browse Source 
- added RAM pressure to LineChart widget
This commit is contained in:
Serhiy Mytrovtsiy
2020-06-30 23:11:40 +02:00
parent 5b6b393c3f
commit aab85cfdfd
9 changed files with 165 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Memory/main.swift
View File

@@ -24,6 +24,8 @@ public struct RAM_Usage: value_t {
var used: Double?
var free: Double?
var pressureLevel: Int
public var widget_value: Double {
get {
return self.usage ?? 0
@@ -63,9 +65,11 @@ public class Memory: Module {
}
if let widget = self.widget as? LineChart {
widget.setValue(value!.usage ?? 0)
widget.setPressure(value?.pressureLevel ?? 0)
}
if let widget = self.widget as? BarChart {
widget.setValue([value!.usage ?? 0])
widget.setPressure(value?.pressureLevel ?? 0)
}
}
}

20
Modules/Memory/readers.swift
View File

@@ -29,7 +29,7 @@ internal class UsageReader: Reader<RAM_Usage> {
self.totalSize = Double(stats.max_mem)
return
}
self.totalSize = 0
print("Error with host_info(): " + (String(cString: mach_error_string(kerr), encoding: String.Encoding.ascii) ?? "unknown error"))
}
@@ -37,22 +37,26 @@ internal class UsageReader: Reader<RAM_Usage> {
public override func read() {
var stats = vm_statistics64()
var count = UInt32(MemoryLayout<vm_statistics64_data_t>.size / MemoryLayout<integer_t>.size)
let result: kern_return_t = withUnsafeMutablePointer(to: &stats) {
$0.withMemoryRebound(to: integer_t.self, capacity: 1) {
host_statistics64(mach_host_self(), HOST_VM_INFO64, $0, &count)
}
}
if result == KERN_SUCCESS {
let active = Double(stats.active_count) * Double(PAGE_SIZE)
let inactive = Double(stats.inactive_count) * Double(PAGE_SIZE)
let wired = Double(stats.wire_count) * Double(PAGE_SIZE)
let compressed = Double(stats.compressor_page_count) * Double(PAGE_SIZE)
let used = active + wired + compressed
let free = self.totalSize - used
var size: size_t = MemoryLayout<uint>.size
var pressureLevel: Int = 0
sysctlbyname("kern.memorystatus_vm_pressure_level", &pressureLevel, &size, nil, 0)
self.callback(RAM_Usage(
active: active,
inactive: inactive,
@@ -62,11 +66,13 @@ internal class UsageReader: Reader<RAM_Usage> {
usage: Double((self.totalSize - free) / self.totalSize),
total: Double(self.totalSize),
used: Double(used),
free: Double(free))
)
free: Double(free),
pressureLevel: pressureLevel
))
return
}
print("Error with host_statistics64(): " + (String(cString: mach_error_string(result), encoding: String.Encoding.ascii) ?? "unknown error"))
}
}