diff --git a/0048-Avoid-deadlock-on-quitting.patch b/0048-Avoid-deadlock-on-quitting.patch new file mode 100644 index 0000000000000000000000000000000000000000..86158d27c623f0d9ecadaf8317708805bf7648fd --- /dev/null +++ b/0048-Avoid-deadlock-on-quitting.patch @@ -0,0 +1,29 @@ +From 1550c9925f98754c7af99d01df460eb6dabb4b0e Mon Sep 17 00:00:00 2001 +From: Andi Kleen +Date: Tue, 2 Dec 2025 22:06:32 -0800 +Subject: [PATCH] Avoid deadlock on quitting + +by resetting the display command mailbox when the display thread exits. + +Originally introduced with 8dfa30ea0311 + +Fixes #98 +--- + common/disp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/common/disp.c b/common/disp.c +index c542b77..75eda9d 100644 +--- a/common/disp.c ++++ b/common/disp.c +@@ -640,6 +640,7 @@ L_EXIT: + perf_fini(); + + debug_print(NULL, 2, "disp thread is exiting\n"); ++ s_disp_ctl.flag = DISP_FLAG_NONE; + return (NULL); + } + +-- +2.49.0 + diff --git a/numatop-upstream-f09ce265.patch b/numatop-upstream-f09ce265.patch new file mode 100644 index 0000000000000000000000000000000000000000..df53264c0b502a0b7de5d29b31c93be741465149 --- /dev/null +++ b/numatop-upstream-f09ce265.patch @@ -0,0 +1,44 @@ +--- a/0048-Avoid-deadlock-on-quitting.patch ++++ b/0048-Avoid-deadlock-on-quitting.patch +@@ -0,0 +1,29 @@ ++From 1550c9925f98754c7af99d01df460eb6dabb4b0e Mon Sep 17 00:00:00 2001 ++From: Andi Kleen ++Date: Tue, 2 Dec 2025 22:06:32 -0800 ++Subject: [PATCH] Avoid deadlock on quitting ++ ++by resetting the display command mailbox when the display thread exits. ++ ++Originally introduced with 8dfa30ea0311 ++ ++Fixes #98 ++--- ++ common/disp.c | 1 + ++ 1 file changed, 1 insertion(+) ++ ++diff --git a/common/disp.c b/common/disp.c ++index c542b77..75eda9d 100644 ++--- a/common/disp.c +++++ b/common/disp.c ++@@ -640,6 +640,7 @@ L_EXIT: ++ perf_fini(); ++ ++ debug_print(NULL, 2, "disp thread is exiting\n"); +++ s_disp_ctl.flag = DISP_FLAG_NONE; ++ return (NULL); ++ } ++ ++-- ++2.49.0 ++ + +--- a/numatop.spec ++++ b/numatop.spec +@@ -55,6 +55,7 @@ Patch44: 0044-common-Resolve-max-count-of-nodes-at-runtime.patch + Patch45: 0045-common-Resolve-max-count-of-CPUs-at-runtime.patch + Patch46: 0046-common-Resolve-max-count-of-CPUs-per-node-at-runtime.patch + Patch47: 0047-common-Remove-unused-NPROCS_NAX.patch ++Patch48: 0048-Avoid-deadlock-on-quitting.patch + + + BuildRequires: autoconf + diff --git a/numatop.spec b/numatop.spec index 93209bb2e58208543e17062b91a68a33fffa8563..a39accc4ba1d921213e3cf6ba592d834d6a546dc 100644 --- a/numatop.spec +++ b/numatop.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %undefine _ld_as_needed Name: numatop @@ -70,6 +70,8 @@ Patch30: 0030-common-remove-executing-commands-for-directory-and-f.patch #Patch31: 0031-powerpc-util-fix-build-warning-cast-LHS-of-expressio.patch # https://github.com/intel/numatop/commit/7dd67b56333bae4a40d825600c3b7cc7df08068d Patch32: 0032-common-os-map-Fix-overflow-warning.patch +# https://github.com/intel/numatop/commit/f09ce2653b10ca69d659684ac54d5de50e6b554b +Patch48: 0048-Avoid-deadlock-on-quitting.patch BuildRequires: autoconf automake make libtool gcc @@ -121,10 +123,13 @@ autoreconf --force --install --symlink %doc AUTHORS %changelog +* Thu Jan 29 2026 wenjie2025 - 2.4-2 +- Add 0048-Avoid-deadlock-on-quitting.patch + * Wed Mar 26 2025 Hong Wei Qin - 2.4-1 - Update to 2.4-1 from 2.3-1 - Add patches to Add missing hunks from last change - [Patches cherry-pick from c10s. Original changelog: + [Patches cherry-pick from c10s. Original changelog: - Add missing hunks from last change] * Mon Apr 24 2023 happy_orange - 2.3-1