[Spice-commits] server/dispatcher.c server/dispatcher.h server/main-dispatcher.c

[GitLab Mirror]

 server/dispatcher.c      |    7 -------
 server/dispatcher.h      |    6 ------
 server/main-dispatcher.c |    8 +++++---
 3 files changed, 5 insertions(+), 16 deletions(-)

New commits:
commit 948ec8b81b55236daac27ba5a6f9dcd0352280c6
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon Mar 16 09:23:00 2020 +0000

    dispatcher: Move thread_id field from Dispatcher to MainDispatcher
    
    Dispatcher is just storing the thead_id for MainDispatcher,
    move thread_if to MainDispatcher to avoid useless field and API.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/dispatcher.c b/server/dispatcher.c
index 4a9eece2..5ee8b6f6 100644
--- a/server/dispatcher.c
+++ b/server/dispatcher.c
@@ -46,7 +46,6 @@ typedef struct DispatcherMessage {
 struct DispatcherPrivate {
     int recv_fd;
     int send_fd;
-    pthread_t thread_id;
     pthread_mutex_t lock;
     DispatcherMessage *messages;
     guint max_message_type;
@@ -125,7 +124,6 @@ static void dispatcher_constructed(GObject *object)
     pthread_mutex_init(&self->priv->lock, NULL);
     self->priv->recv_fd = channels[0];
     self->priv->send_fd = channels[1];
-    self->priv->thread_id = pthread_self();
 
     self->priv->messages = g_new0(DispatcherMessage,
                                   self->priv->max_message_type);
@@ -406,8 +404,3 @@ void dispatcher_set_opaque(Dispatcher *self, void *opaque)
 {
     self->priv->opaque = opaque;
 }
-
-pthread_t dispatcher_get_thread_id(Dispatcher *self)
-{
-    return self->priv->thread_id;
-}
diff --git a/server/dispatcher.h b/server/dispatcher.h
index 5bd0b105..0dcb2599 100644
--- a/server/dispatcher.h
+++ b/server/dispatcher.h
@@ -167,10 +167,4 @@ SpiceWatch *dispatcher_create_watch(Dispatcher *dispatcher, SpiceCoreInterfaceIn
  */
 void dispatcher_set_opaque(Dispatcher *dispatcher, void *opaque);
 
-/* dispatcher_get_thread_id
- *
- * Returns the id of the thread that created this Dispatcher object
- */
-pthread_t dispatcher_get_thread_id(Dispatcher *self);
-
 #endif /* DISPATCHER_H_ */
diff --git a/server/main-dispatcher.c b/server/main-dispatcher.c
index 7579fd37..1724af1c 100644
--- a/server/main-dispatcher.c
+++ b/server/main-dispatcher.c
@@ -50,6 +50,7 @@ struct MainDispatcherPrivate
 {
     RedsState *reds; /* weak */
     SpiceWatch *watch;
+    pthread_t thread_id;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE(MainDispatcher, main_dispatcher, TYPE_DISPATCHER)
@@ -119,6 +120,7 @@ static void
 main_dispatcher_init(MainDispatcher *self)
 {
     self->priv = main_dispatcher_get_instance_private(self);
+    self->priv->thread_id = pthread_self();
 }
 
 enum {
@@ -162,7 +164,7 @@ void main_dispatcher_channel_event(MainDispatcher *self, int event, SpiceChannel
 {
     MainDispatcherChannelEventMessage msg = {0,};
 
-    if (pthread_self() == dispatcher_get_thread_id(DISPATCHER(self))) {
+    if (pthread_self() == self->priv->thread_id) {
         reds_handle_channel_event(self->priv->reds, event, info);
         return;
     }
@@ -208,7 +210,7 @@ void main_dispatcher_seamless_migrate_dst_complete(MainDispatcher *self,
 {
     MainDispatcherMigrateSeamlessDstCompleteMessage msg;
 
-    if (pthread_self() == dispatcher_get_thread_id(DISPATCHER(self))) {
+    if (pthread_self() == self->priv->thread_id) {
         reds_on_client_seamless_migrate_complete(self->priv->reds, client);
         return;
     }
@@ -222,7 +224,7 @@ void main_dispatcher_set_mm_time_latency(MainDispatcher *self, RedClient *client
 {
     MainDispatcherMmTimeLatencyMessage msg;
 
-    if (pthread_self() == dispatcher_get_thread_id(DISPATCHER(self))) {
+    if (pthread_self() == self->priv->thread_id) {
         reds_set_client_mm_time_latency(self->priv->reds, client, latency);
         return;
     }