From 6f08777b203585713da542fb2f99a9258ff61ec4 Mon Sep 17 00:00:00 2001 From: ferreo Date: Wed, 15 Jan 2025 14:03:58 +0000 Subject: [PATCH] Fix scx scheduler reactivation + improve info logging - actual fix it this time --- .github/release-nest-v3 | 2 +- falcond/debian/changelog | 6 ++++++ falcond/src/clients/vcache_setting.zig | 2 +- falcond/src/profile/manager.zig | 2 +- main.sh | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 0cfbf08..d00491f 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -2 +1 diff --git a/falcond/debian/changelog b/falcond/debian/changelog index 643ddbc..fcaa292 100644 --- a/falcond/debian/changelog +++ b/falcond/debian/changelog @@ -1,3 +1,9 @@ +falcond (1.0.5-101pika1) pika; urgency=low + + * Fix scx scheduler reactivation + improve info logging - actual fix it this time + + -- ferreo Sun, 12 Jan 2025 13:48:00 +0300 + falcond (1.0.4-101pika1) pika; urgency=low * Fix scx scheduler reactivation + improve info logging diff --git a/falcond/src/clients/vcache_setting.zig b/falcond/src/clients/vcache_setting.zig index f3283fb..bceaa33 100644 --- a/falcond/src/clients/vcache_setting.zig +++ b/falcond/src/clients/vcache_setting.zig @@ -15,7 +15,7 @@ var previous_mode_buffer: [10]u8 = undefined; pub fn applyVCacheMode(vcache_mode: VCacheMode) void { const file = fs.openFileAbsolute(vcache_path, .{ .mode = .read_write }) catch |err| switch (err) { error.FileNotFound => { - if (vcache_mode == .none) { + if (vcache_mode != .none) { std.log.info("AMD dual CCD 3D vcache support not detected", .{}); } return; diff --git a/falcond/src/profile/manager.zig b/falcond/src/profile/manager.zig index 3c01d50..fa9bac4 100644 --- a/falcond/src/profile/manager.zig +++ b/falcond/src/profile/manager.zig @@ -86,7 +86,7 @@ pub const ProfileManager = struct { } vcache_setting.applyVCacheMode(.none); - try scx_scheds.deactivateScheduler(self.allocator); + scx_scheds.restorePreviousState(self.allocator); self.active_profile = null; if (self.queued_profiles.items.len > 0) { diff --git a/main.sh b/main.sh index e82c286..57e3f34 100755 --- a/main.sh +++ b/main.sh @@ -2,7 +2,7 @@ set -e -VERSION="1.0.4" +VERSION="1.0.5" source ./pika-build-config.sh