Compare commits

..
Author SHA1 Message Date
gronod 66401bec28 feat(telemetry): implement load average and thread concurrency provider (fixes #7)
MacMonitor CI/CD Pipeline / Build & Test (Intel x86_64) (push) Canceled after 0s
2026-09-08 12:33:14 +01:00
gronod 76cb48be09 Merge branch 'feat/6-kernel-counters' into milestone/m3-advanced-telemetry
MacMonitor CI/CD Pipeline / Build & Test (Intel x86_64) (push) Canceled after 0s
2026-09-08 12:32:22 +01:00
4 changed files with 188 additions and 0 deletions
@@ -20,5 +20,6 @@
#import "MMComponentThermalProvider.h" #import "MMComponentThermalProvider.h"
#import "MMPowerTelemetryProvider.h" #import "MMPowerTelemetryProvider.h"
#import "MMKernelTelemetryProvider.h" #import "MMKernelTelemetryProvider.h"
#import "MMLoadAverageProvider.h"
#endif /* MacMonitor_Bridging_Header_h */ #endif /* MacMonitor_Bridging_Header_h */
@@ -0,0 +1,33 @@
#ifndef MMLoadAverageProvider_h
#define MMLoadAverageProvider_h
#import <Foundation/Foundation.h>
#import "MMTelemetryProvider.h"
NS_ASSUME_NONNULL_BEGIN
/**
* MMLoadAverageProvider
* Samples 1m, 5m, and 15m system load averages, Mach concurrency factors,
* and system-wide task and thread counts.
*/
@interface MMLoadAverageProvider : NSObject <MMTelemetryProvider>
- (instancetype)init;
/**
* Pure calculator method for deterministic unit testing.
*/
+ (NSDictionary<NSString *, id> *)calculateLoadMetricsWithLoad1:(double)load1
load5:(double)load5
load15:(double)load15
taskCount:(int)taskCount
threadCount:(int)threadCount
cpuCount:(int)cpuCount
machFactor:(double)machFactor;
@end
NS_ASSUME_NONNULL_END
#endif /* MMLoadAverageProvider_h */
@@ -0,0 +1,92 @@
#import "MMLoadAverageProvider.h"
#import <mach/mach.h>
#import <mach/processor_info.h>
#import <sys/sysctl.h>
#import <stdlib.h>
@implementation MMLoadAverageProvider
- (instancetype)init {
self = [super init];
return self;
}
- (MMTelemetryDomain)domain {
return MMTelemetryDomainSystem;
}
- (NSString *)providerIdentifier {
return @"com.i3omb.macmonitor.telemetry.system.load";
}
- (BOOL)isAvailable {
return YES;
}
+ (NSDictionary<NSString *, id> *)calculateLoadMetricsWithLoad1:(double)load1
load5:(double)load5
load15:(double)load15
taskCount:(int)taskCount
threadCount:(int)threadCount
cpuCount:(int)cpuCount
machFactor:(double)machFactor {
int safeCpus = cpuCount > 0 ? cpuCount : 1;
double norm1 = load1 / (double)safeCpus;
double norm5 = load5 / (double)safeCpus;
double norm15 = load15 / (double)safeCpus;
return @{
@"load1m": @(load1),
@"load5m": @(load5),
@"load15m": @(load15),
@"normalizedLoad1m": @(norm1),
@"normalizedLoad5m": @(norm5),
@"normalizedLoad15m": @(norm15),
@"taskCount": @(taskCount),
@"threadCount": @(threadCount),
@"logicalCpuCount": @(safeCpus),
@"machFactor": @(machFactor),
@"isOverloaded": @(norm1 > 1.0)
};
}
- (nullable NSDictionary<NSString *, id> *)sampleTelemetryWithError:(NSError **)error {
// 1. Get BSD load averages
double load[3] = {0.0, 0.0, 0.0};
int ret = getloadavg(load, 3);
if (ret <= 0) {
load[0] = 0.0;
load[1] = 0.0;
load[2] = 0.0;
}
// 2. Query Mach processor set for task & thread counts and mach factor
mach_port_t host = mach_host_self();
processor_set_name_port_t pset = MACH_PORT_NULL;
processor_set_load_info_data_t loadInfo = {0};
mach_msg_type_number_t count = PROCESSOR_SET_LOAD_INFO_COUNT;
kern_return_t kr = processor_set_default(host, &pset);
if (kr == KERN_SUCCESS && MACH_PORT_VALID(pset)) {
kr = processor_set_statistics(pset, PROCESSOR_SET_LOAD_INFO, (processor_set_info_t)&loadInfo, &count);
mach_port_deallocate(mach_task_self(), pset);
}
double machFactor = (double)loadInfo.mach_factor / (double)LOAD_SCALE;
// 3. Query logical CPU core count
int cpuCount = 1;
size_t size = sizeof(cpuCount);
sysctlbyname("hw.logicalcpu", &cpuCount, &size, NULL, 0);
if (cpuCount <= 0) cpuCount = 1;
return [MMLoadAverageProvider calculateLoadMetricsWithLoad1:load[0]
load5:load[1]
load15:load[2]
taskCount:loadInfo.task_count
threadCount:loadInfo.thread_count
cpuCount:cpuCount
machFactor:machFactor];
}
@end
+62
View File
@@ -0,0 +1,62 @@
import XCTest
@testable import MacMonitor
final class MMLoadAverageTests: XCTestCase {
func testLoadMetricsCalculation() {
let metrics = MMLoadAverageProvider.calculateLoadMetrics(
withLoad1: 4.0,
load5: 3.5,
load15: 2.5,
taskCount: 500,
threadCount: 2200,
cpuCount: 8,
machFactor: 1.25
)
let load1 = metrics["load1m"] as? Double ?? 0
let norm1 = metrics["normalizedLoad1m"] as? Double ?? 0
let norm5 = metrics["normalizedLoad5m"] as? Double ?? 0
let taskCount = metrics["taskCount"] as? Int ?? 0
let threadCount = metrics["threadCount"] as? Int ?? 0
let isOverloaded = metrics["isOverloaded"] as? Bool ?? true
XCTAssertEqual(load1, 4.0, accuracy: 0.01)
XCTAssertEqual(norm1, 4.0 / 8.0, accuracy: 0.01)
XCTAssertEqual(norm5, 3.5 / 8.0, accuracy: 0.01)
XCTAssertEqual(taskCount, 500)
XCTAssertEqual(threadCount, 2200)
XCTAssertFalse(isOverloaded)
}
func testOverloadedStateDetection() {
let metrics = MMLoadAverageProvider.calculateLoadMetrics(
withLoad1: 12.0,
load5: 10.0,
load15: 8.0,
taskCount: 650,
threadCount: 3100,
cpuCount: 8,
machFactor: 0.4
)
let isOverloaded = metrics["isOverloaded"] as? Bool ?? false
let norm1 = metrics["normalizedLoad1m"] as? Double ?? 0
XCTAssertTrue(isOverloaded)
XCTAssertEqual(norm1, 1.5, accuracy: 0.01)
}
func testLiveLoadAverageProvider() throws {
let provider = MMLoadAverageProvider()
XCTAssertEqual(provider.domain, .system)
XCTAssertEqual(provider.providerIdentifier, "com.i3omb.macmonitor.telemetry.system.load")
let sample = try provider.sampleTelemetry()
XCTAssertNotNil(sample)
XCTAssertNotNil(sample["load1m"])
XCTAssertNotNil(sample["taskCount"])
XCTAssertNotNil(sample["threadCount"])
XCTAssertNotNil(sample["normalizedLoad1m"])
}
}