wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 83febc6b55cf9e7f97299e391771b9ad0d1f1ceb.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2024-10-24 09:49:30 +11:00
parent 16cfc61df8
commit 78bd3f0c6d
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server-Signal_Thread/0001-server-Do-not-signal-thread-until-it-is-really-gone.patch
View File

@@ -1,4 +1,4 @@
From f649ffcd8f68f82be173367b66f3c505ff75bcc3 Mon Sep 17 00:00:00 2001
From 222ae102097fd34e6ff52813d1c0a165c7165776 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 12 Nov 2018 18:10:32 +0200
Subject: [PATCH] server: Do not signal violently terminated threads until they
@@ -27,10 +27,10 @@ Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/server/thread.c b/server/thread.c
index 55386192fe6..60cd4ee16a8 100644
index f7e5e5fabe8..506adfc0a6f 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -241,6 +241,7 @@ static inline void init_thread_structure( struct thread *thread )
@@ -246,6 +246,7 @@ static inline void init_thread_structure( struct thread *thread )
thread->token = NULL;
thread->desc = NULL;
thread->desc_len = 0;
@@ -38,7 +38,7 @@ index 55386192fe6..60cd4ee16a8 100644
thread->creation_time = current_time;
thread->exit_time = 0;
@@ -431,6 +432,7 @@ static void destroy_thread( struct object *obj )
@@ -450,6 +451,7 @@ static void destroy_thread( struct object *obj )
list_remove( &thread->entry );
cleanup_thread( thread );
release_object( thread->process );
@@ -46,7 +46,7 @@ index 55386192fe6..60cd4ee16a8 100644
if (thread->id) free_ptid( thread->id );
if (thread->token) release_object( thread->token );
}
@@ -455,7 +457,7 @@ static struct object_type *thread_get_type( struct object *obj )
@@ -467,7 +469,7 @@ static void dump_thread( struct object *obj, int verbose )
static int thread_signaled( struct object *obj, struct wait_queue_entry *entry )
{
struct thread *mythread = (struct thread *)obj;
@@ -55,7 +55,7 @@ index 55386192fe6..60cd4ee16a8 100644
}
static unsigned int thread_map_access( struct object *obj, unsigned int access )
@@ -1249,6 +1251,26 @@ int thread_get_inflight_fd( struct thread *thread, int client )
@@ -1275,6 +1277,26 @@ int thread_get_inflight_fd( struct thread *thread, int client )
return -1;
}
@@ -82,7 +82,7 @@ index 55386192fe6..60cd4ee16a8 100644
/* kill a thread on the spot */
void kill_thread( struct thread *thread, int violent_death )
{
@@ -1268,8 +1290,12 @@ void kill_thread( struct thread *thread, int violent_death )
@@ -1294,8 +1316,12 @@ void kill_thread( struct thread *thread, int violent_death )
}
kill_console_processes( thread, 0 );
abandon_mutexes( thread );
@@ -98,17 +98,17 @@ index 55386192fe6..60cd4ee16a8 100644
remove_process_thread( thread->process, thread );
release_object( thread );
diff --git a/server/thread.h b/server/thread.h
index 184fa92d250..077ab0929ba 100644
index a1bc5060bb9..edf2a825451 100644
--- a/server/thread.h
+++ b/server/thread.h
@@ -90,6 +90,7 @@ struct thread
struct list kernel_object; /* list of kernel object pointers */
@@ -93,6 +93,7 @@ struct thread
data_size_t desc_len; /* thread description length in bytes */
WCHAR *desc; /* thread description string */
struct completion_wait *completion_wait; /* completion port wait object the thread is associated with */
+ struct timeout_user *exit_poll; /* poll if the thread/process has exited already */
};
extern struct thread *current;
--
2.29.2
2.45.2