From: Rémi Bernon rbernon@codeweavers.com
Instead of the dual inproc / server sync. --- server/inproc_sync.c | 5 +-- server/queue.c | 74 ++++++++++++++++---------------------------- server/user.h | 1 - 3 files changed, 27 insertions(+), 53 deletions(-)
diff --git a/server/inproc_sync.c b/server/inproc_sync.c index 41a9c2770a7..435c58947f3 100644 --- a/server/inproc_sync.c +++ b/server/inproc_sync.c @@ -138,10 +138,7 @@ static int get_inproc_sync_fd( struct object *obj, int *type ) struct object *sync; int fd = -1;
- if (obj != (struct object *)current->queue) sync = get_obj_sync( obj ); - else sync = thread_queue_inproc_sync( current ); - if (!sync) return -1; - + if (!(sync = get_obj_sync( obj ))) return -1; if (sync->ops == &inproc_sync_ops) { struct inproc_sync *inproc = (struct inproc_sync *)sync; diff --git a/server/queue.c b/server/queue.c index 825ecb7217c..97cb11c8cc0 100644 --- a/server/queue.c +++ b/server/queue.c @@ -119,8 +119,7 @@ struct msg_queue { struct object obj; /* object header */ struct fd *fd; /* optional file descriptor to poll */ - struct inproc_sync *inproc_sync; /* inproc sync for client-side waits */ - int signaled; /* queue is signaled from fd POLLIN or masks */ + struct event_sync *sync; /* sync object for wait/signal */ int paint_count; /* pending paint messages count */ int hotkey_count; /* pending hotkey messages count */ int quit_message; /* is there a pending quit message? */ @@ -151,7 +150,7 @@ struct hotkey };
static void msg_queue_dump( struct object *obj, int verbose ); -static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entry ); +static struct object *msg_queue_get_sync( struct object *obj ); static void msg_queue_destroy( struct object *obj ); static void msg_queue_poll_event( struct fd *fd, int event ); static void thread_input_dump( struct object *obj, int verbose ); @@ -163,13 +162,13 @@ static const struct object_ops msg_queue_ops = sizeof(struct msg_queue), /* size */ &no_type, /* type */ msg_queue_dump, /* dump */ - add_queue, /* add_queue */ - remove_queue, /* remove_queue */ - msg_queue_signaled, /* signaled */ - no_satisfied, /* satisfied */ + NULL, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - default_get_sync, /* get_sync */ + msg_queue_get_sync, /* get_sync */ default_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -306,8 +305,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ if ((queue = alloc_object( &msg_queue_ops ))) { queue->fd = NULL; - queue->inproc_sync = NULL; - queue->signaled = 0; + queue->sync = NULL; queue->paint_count = 0; queue->hotkey_count = 0; queue->quit_message = 0; @@ -324,7 +322,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ list_init( &queue->expired_timers ); for (i = 0; i < NB_MSG_KINDS; i++) list_init( &queue->msg_list[i] );
- if (get_inproc_device_fd() >= 0 && !(queue->inproc_sync = create_inproc_internal_sync( 1, 0 ))) goto error; + if (!(queue->sync = create_event_sync( 1, 0 ))) goto error; if (!(queue->shared = alloc_shared_object())) goto error;
SHARED_WRITE_BEGIN( queue->shared, queue_shm_t ) @@ -712,20 +710,6 @@ void add_queue_hook_count( struct thread *thread, unsigned int index, int count assert( thread->queue->shared->hooks_count[index] >= 0 ); }
-static void signal_queue_sync( struct msg_queue *queue ) -{ - if (queue->signaled) return; - queue->signaled = 1; - wake_up( &queue->obj, 0 ); - if (queue->inproc_sync) signal_inproc_sync( queue->inproc_sync ); -} - -static void reset_queue_sync( struct msg_queue *queue ) -{ - queue->signaled = 0; - if (queue->inproc_sync) reset_inproc_sync( queue->inproc_sync ); -} - /* check the queue status */ static inline int get_queue_status( struct msg_queue *queue ) { @@ -756,7 +740,7 @@ static inline void set_queue_bits( struct msg_queue *queue, unsigned int bits ) } SHARED_WRITE_END;
- if (get_queue_status( queue )) signal_queue_sync( queue ); + if (get_queue_status( queue )) signal_sync( queue->sync ); }
/* clear some queue bits */ @@ -780,7 +764,7 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits if (queue->keystate_lock) unlock_input_keystate( queue->input ); queue->keystate_lock = 0; } - if (!get_queue_status( queue )) reset_queue_sync( queue ); + if (!get_queue_status( queue )) reset_sync( queue->sync ); }
/* check if message is matched by the filter */ @@ -1291,22 +1275,22 @@ static void cleanup_results( struct msg_queue *queue ) static int is_queue_hung( struct msg_queue *queue ) { /* queue is hung if it's signaled and thread didn't access it for more than 5 seconds */ - return queue->signaled && monotonic_time - queue->shared->access_time > 5 * TICKS_PER_SEC; + return get_queue_status( queue ) && monotonic_time - queue->shared->access_time > 5 * TICKS_PER_SEC; }
-static void msg_queue_dump( struct object *obj, int verbose ) +static struct object *msg_queue_get_sync( struct object *obj ) { struct msg_queue *queue = (struct msg_queue *)obj; - queue_shm_t *queue_shm = queue->shared; - fprintf( stderr, "Msg queue bits=%x mask=%x\n", - queue_shm->wake_bits, queue_shm->wake_mask ); + assert( obj->ops == &msg_queue_ops ); + return grab_object( queue->sync ); }
-static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entry ) +static void msg_queue_dump( struct object *obj, int verbose ) { struct msg_queue *queue = (struct msg_queue *)obj; - assert( obj->ops == &msg_queue_ops ); - return queue->signaled; + queue_shm_t *queue_shm = queue->shared; + fprintf( stderr, "Msg queue bits=%x mask=%x\n", + queue_shm->wake_bits, queue_shm->wake_mask ); }
static void msg_queue_destroy( struct object *obj ) @@ -1352,7 +1336,7 @@ static void msg_queue_destroy( struct object *obj ) if (queue->hooks) release_object( queue->hooks ); if (queue->fd) release_object( queue->fd ); if (queue->shared) free_shared_object( queue->shared ); - if (queue->inproc_sync) release_object( queue->inproc_sync ); + if (queue->sync) release_object( queue->sync ); }
static void msg_queue_poll_event( struct fd *fd, int event ) @@ -1442,12 +1426,6 @@ int init_thread_queue( struct thread *thread ) return (create_msg_queue( thread, NULL ) != NULL); }
-struct object *thread_queue_inproc_sync( struct thread *thread ) -{ - if (!thread->queue) return NULL; - return grab_object( thread->queue->inproc_sync ); -} - /* attach two thread input data structures */ int attach_thread_input( struct thread *thread_from, struct thread *thread_to ) { @@ -3139,8 +3117,8 @@ DECL_HANDLER(set_queue_mask) } SHARED_WRITE_END;
- if (!get_queue_status( queue )) reset_queue_sync( queue ); - else signal_queue_sync( queue ); + if (!get_queue_status( queue )) reset_sync( queue->sync ); + else signal_sync( queue->sync ); }
@@ -3161,7 +3139,7 @@ DECL_HANDLER(get_queue_status) } SHARED_WRITE_END;
- if (!get_queue_status( queue )) reset_queue_sync( queue ); + if (!get_queue_status( queue )) reset_sync( queue->sync ); }
@@ -3361,7 +3339,7 @@ DECL_HANDLER(get_message) } SHARED_WRITE_END;
- if (!get_queue_status( queue )) reset_queue_sync( queue ); + if (!get_queue_status( queue )) reset_sync( queue->sync );
/* then check for posted messages */ if ((filter & QS_POSTMESSAGE) && @@ -3422,8 +3400,8 @@ DECL_HANDLER(get_message) } SHARED_WRITE_END;
- if (!get_queue_status( queue )) reset_queue_sync( queue ); - else signal_queue_sync( queue ); + if (!get_queue_status( queue )) reset_sync( queue->sync ); + else signal_sync( queue->sync ); set_error( STATUS_PENDING ); /* FIXME */ }
diff --git a/server/user.h b/server/user.h index 35bd396f859..73b10aaf5ac 100644 --- a/server/user.h +++ b/server/user.h @@ -120,7 +120,6 @@ 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 struct object *thread_queue_inproc_sync( 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 struct rectangle *rect,