system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-06-29 06:14:34 +00:00
Code Issues Projects Releases Wiki Activity

server: Avoid calling set_event from within msg_queue_add_queue.

Browse Source
This commit is contained in:
Rémi Bernon 2024-06-04 22:40:46 +02:00 committed by Alexandre Julliard
parent 83a143efe0
commit 9ec501141e
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/queue.c
View File

@ -1098,7 +1098,6 @@ static int is_queue_hung( struct msg_queue *queue )
static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *entry )
{
struct msg_queue *queue = (struct msg_queue *)obj;
struct process *process = get_wait_queue_thread(entry)->process;
/* a thread can only wait on its own queue */
if (get_wait_queue_thread(entry)->queue != queue)
@ -1106,7 +1105,6 @@ static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *ent
set_error( STATUS_ACCESS_DENIED );
return 0;
}
if (process->idle_event && !(queue->wake_mask & QS_SMRESULT)) set_event( process->idle_event );
if (queue->fd && list_empty( &obj->wait_queue )) /* first on the queue */
set_fd_events( queue->fd, POLLIN );
@ -1255,6 +1253,14 @@ static int check_queue_input_window( struct msg_queue *queue, user_handle_t wind
return ret;
}
/* check if the thread queue is idle and set the process idle event if so */
void check_thread_queue_idle( struct thread *thread )
{
struct msg_queue *queue = thread->queue;
if ((queue->wake_mask & QS_SMRESULT)) return;
if (thread->process->idle_event) set_event( thread->process->idle_event );
}
/* make sure the specified thread has a queue */
int init_thread_queue( struct thread *thread )
{

8
server/thread.c
View File

@ -778,7 +778,7 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj
{
struct thread_wait *wait;
struct wait_queue_entry *entry;
unsigned int i;
unsigned int i, idle = 0;
if (!(wait = mem_alloc( FIELD_OFFSET(struct thread_wait, queues[count]) ))) return 0;
wait->next = current->wait;
@ -802,8 +802,12 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj
end_wait( current, get_error() );
return 0;
}
if (obj == (struct object *)current->queue) idle = 1;
}
return 1;
if (idle) check_thread_queue_idle( current );
return current->wait ? 1 : 0;
}
static int wait_on_handles( const select_op_t *select_op, unsigned int count, const obj_handle_t *handles,

1
server/user.h
View File

@ -113,6 +113,7 @@ extern void set_queue_hooks( struct thread *thread, struct hook_table *hooks );
extern void inc_queue_paint_count( struct thread *thread, int incr );
extern void queue_cleanup_window( struct thread *thread, user_handle_t win );
extern int init_thread_queue( struct thread *thread );
extern void check_thread_queue_idle( struct thread *thread );
extern int attach_thread_input( struct thread *thread_from, struct thread *thread_to );
extern void detach_thread_input( struct thread *thread_from );
extern void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect,