[PATCH 1/3] server: Do not cancel process sigkill in kill_process().

Paul Gofman pgofman at codeweavers.com
Tue Mar 30 12:32:13 CDT 2021


Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
    The series avoids process being left alive on normal process termination if some of the native exit handlers hang.

    I hope it might fix https://bugs.winehq.org/show_bug.cgi?id=49897 but I am mostly unable to reproduce that here so
    cannot verify.

 server/process.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/server/process.c b/server/process.c
index 7bc096a7b1f..9a647e7eddc 100644
--- a/server/process.c
+++ b/server/process.c
@@ -946,12 +946,7 @@ void kill_process( struct process *process, int violent_death )
     }
 
     if (process->sigkill_timeout)  /* already waiting for it to die */
-    {
-        remove_timeout_user( process->sigkill_timeout );
-        process->sigkill_timeout = NULL;
-        process_died( process );
         return;
-    }
 
     if (violent_death) terminate_process( process, NULL, 1 );
     else
-- 
2.30.2




More information about the wine-devel mailing list