From e601e920bd5a8385f7388cf31e0b0d543f68193e Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Tue, 3 Sep 2013 22:24:44 +0200 Subject: server: make more of cursor private MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Fabiano Fidêncio --- server/cursor-channel.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++-- server/cursor-channel.h | 50 +++----------------------------- server/red_channel.h | 2 ++ server/red_worker.c | 23 +++++---------- server/red_worker.h | 1 + 5 files changed, 89 insertions(+), 64 deletions(-) diff --git a/server/cursor-channel.c b/server/cursor-channel.c index 48f9ad37..91eb55d8 100644 --- a/server/cursor-channel.c +++ b/server/cursor-channel.c @@ -19,6 +19,41 @@ #include "common/generated_server_marshallers.h" #include "cursor-channel.h" +#define CLIENT_CURSOR_CACHE_SIZE 256 + +#define CURSOR_CACHE_HASH_SHIFT 8 +#define CURSOR_CACHE_HASH_SIZE (1 << CURSOR_CACHE_HASH_SHIFT) +#define CURSOR_CACHE_HASH_MASK (CURSOR_CACHE_HASH_SIZE - 1) +#define CURSOR_CACHE_HASH_KEY(id) ((id) & CURSOR_CACHE_HASH_MASK) + +enum { + PIPE_ITEM_TYPE_CURSOR = PIPE_ITEM_TYPE_COMMON_LAST, + PIPE_ITEM_TYPE_CURSOR_INIT, + PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE, +}; + +typedef struct CursorItem { + QXLInstance *qxl; + uint32_t group_id; + int refs; + RedCursorCmd *red_cursor; +} CursorItem; + +G_STATIC_ASSERT(sizeof(CursorItem) <= QXL_CURSUR_DEVICE_DATA_SIZE); + +typedef struct LocalCursor { + CursorItem base; + SpicePoint16 position; + uint32_t data_size; + SpiceCursor red_cursor; +} LocalCursor; + +typedef struct CursorPipeItem { + PipeItem base; + CursorItem *cursor_item; + int refs; +} CursorPipeItem; + struct CursorChannel { CommonChannel common; // Must be the first thing @@ -34,6 +69,16 @@ struct CursorChannel { #endif }; +struct CursorChannelClient { + CommonChannelClient common; + + CacheItem *cursor_cache[CURSOR_CACHE_HASH_SIZE]; + Ring cursor_cache_lru; + long cursor_cache_available; + uint32_t cursor_cache_items; +}; + + #define RCC_TO_CCC(rcc) SPICE_CONTAINEROF((rcc), CursorChannelClient, common.base) #define CLIENT_CURSOR_CACHE @@ -50,7 +95,7 @@ static inline CursorItem *alloc_cursor_item(void) return cursor_item; } -CursorItem *cursor_item_new(RedCursorCmd *cmd, uint32_t group_id) +static CursorItem *cursor_item_new(RedCursorCmd *cmd, uint32_t group_id) { CursorItem *cursor_item; @@ -63,7 +108,7 @@ CursorItem *cursor_item_new(RedCursorCmd *cmd, uint32_t group_id) return cursor_item; } -void cursor_item_unref(QXLInstance *qxl, CursorItem *cursor) +static void cursor_item_unref(QXLInstance *qxl, CursorItem *cursor) { if (!--cursor->refs) { QXLReleaseInfoExt release_info_ext; @@ -390,6 +435,17 @@ CursorChannel* cursor_channel_new(RedWorker *worker) return cursor_channel; } +void cursor_channel_client_migrate(CursorChannelClient* client) +{ + RedChannelClient *rcc; + + spice_return_if_fail(client); + rcc = RED_CHANNEL_CLIENT(client); + + red_channel_client_pipe_add_type(rcc, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE); + red_channel_client_default_migrate(rcc); +} + CursorChannelClient* cursor_channel_client_new(CursorChannel *cursor, RedClient *client, RedsStream *stream, int mig_target, uint32_t *common_caps, int num_common_caps, @@ -476,6 +532,23 @@ void cursor_channel_reset(CursorChannel *cursor) } } +void cursor_channel_init(CursorChannel *cursor, CursorChannelClient *client) +{ + spice_return_if_fail(cursor); + + if (red_channel_is_connected(&cursor->common.base) + || COMMON_CHANNEL(cursor)->during_target_migrate) { + spice_debug("during_target_migrate: skip init"); + return; + } + + if (client) + red_channel_client_pipe_add_type(RED_CHANNEL_CLIENT(client), + PIPE_ITEM_TYPE_CURSOR_INIT); + else + red_channel_pipes_add_type(RED_CHANNEL(cursor), PIPE_ITEM_TYPE_CURSOR_INIT); +} + void cursor_channel_set_mouse_mode(CursorChannel *cursor, uint32_t mode) { spice_return_if_fail(cursor); diff --git a/server/cursor-channel.h b/server/cursor-channel.h index 5d4f8ea2..887f8479 100644 --- a/server/cursor-channel.h +++ b/server/cursor-channel.h @@ -25,66 +25,24 @@ #include "cache-item.h" #include "stat.h" -#define CLIENT_CURSOR_CACHE_SIZE 256 - -#define CURSOR_CACHE_HASH_SHIFT 8 -#define CURSOR_CACHE_HASH_SIZE (1 << CURSOR_CACHE_HASH_SHIFT) -#define CURSOR_CACHE_HASH_MASK (CURSOR_CACHE_HASH_SIZE - 1) -#define CURSOR_CACHE_HASH_KEY(id) ((id) & CURSOR_CACHE_HASH_MASK) - -enum { - PIPE_ITEM_TYPE_CURSOR = PIPE_ITEM_TYPE_COMMON_LAST, - PIPE_ITEM_TYPE_CURSOR_INIT, - PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE, -}; - typedef struct CursorChannel CursorChannel; +typedef struct CursorChannelClient CursorChannelClient; -typedef struct CursorItem { - uint32_t group_id; - int refs; - RedCursorCmd *red_cursor; -} CursorItem; - -typedef struct CursorPipeItem { - PipeItem base; - CursorItem *cursor_item; - int refs; -} CursorPipeItem; - -typedef struct LocalCursor { - CursorItem base; - SpicePoint16 position; - uint32_t data_size; - SpiceCursor red_cursor; -} LocalCursor; - -typedef struct CursorChannelClient { - CommonChannelClient common; - - CacheItem *cursor_cache[CURSOR_CACHE_HASH_SIZE]; - Ring cursor_cache_lru; - long cursor_cache_available; - uint32_t cursor_cache_items; -} CursorChannelClient; - -G_STATIC_ASSERT(sizeof(CursorItem) <= QXL_CURSUR_DEVICE_DATA_SIZE); +#define CURSOR_CHANNEL_CLIENT(Client) ((CursorChannelClient*)(Client)) CursorChannel* cursor_channel_new (RedWorker *worker); void cursor_channel_disconnect (CursorChannel *cursor_channel); void cursor_channel_reset (CursorChannel *cursor); +void cursor_channel_init (CursorChannel *cursor, CursorChannelClient* client); void cursor_channel_process_cmd (CursorChannel *cursor, RedCursorCmd *cursor_cmd, uint32_t group_id); void cursor_channel_set_mouse_mode(CursorChannel *cursor, uint32_t mode); -CursorItem* cursor_item_new (RedCursorCmd *cmd, uint32_t group_id); -void cursor_item_unref (QXLInstance *qxl, CursorItem *cursor); - - CursorChannelClient* cursor_channel_client_new(CursorChannel *cursor, RedClient *client, RedsStream *stream, int mig_target, uint32_t *common_caps, int num_common_caps, uint32_t *caps, int num_caps); +void cursor_channel_client_migrate(CursorChannelClient* client); #endif /* CURSOR_CHANNEL_H_ */ diff --git a/server/red_channel.h b/server/red_channel.h index 201a4d27..eda4436e 100644 --- a/server/red_channel.h +++ b/server/red_channel.h @@ -302,6 +302,8 @@ struct RedChannelClient { RedChannelClientConnectivityMonitor connectivity_monitor; }; +#define RED_CHANNEL_CLIENT(Client) ((RedChannelClient *)(Client)) + struct RedChannel { uint32_t type; uint32_t id; diff --git a/server/red_worker.c b/server/red_worker.c index ecfdea17..a15d5b68 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -9065,7 +9065,7 @@ static int common_channel_config_socket(RedChannelClient *rcc) RedClient *client = red_channel_client_get_client(rcc); MainChannelClient *mcc = red_client_get_main(client); RedsStream *stream = red_channel_client_get_stream(rcc); - CommonChannelClient *ccc = SPICE_CONTAINEROF(rcc, CommonChannelClient, base); + CommonChannelClient *ccc = COMMON_CHANNEL_CLIENT(rcc); int flags; int delay_val; @@ -9550,14 +9550,14 @@ static void red_connect_cursor(RedWorker *worker, RedClient *client, RedsStream return; } - RedChannelClient *rcc = &ccc->common.base; + RedChannelClient *rcc = RED_CHANNEL_CLIENT(ccc); red_channel_client_ack_zero_messages_window(rcc); red_channel_client_push_set_ack(rcc); + // TODO: why do we check for context.canvas? defer this to after display cc is connected // and test it's canvas? this is just a test to see if there is an active renderer? - if (worker->surfaces[0].context.canvas && !COMMON_CHANNEL(channel)->during_target_migrate) { - red_channel_client_pipe_add_type(rcc, PIPE_ITEM_TYPE_CURSOR_INIT); - } + if (worker->surfaces[0].context.canvas) + cursor_channel_init(channel, ccc); } static void surface_dirty_region_to_rects(RedSurface *surface, @@ -9899,11 +9899,7 @@ static void dev_create_primary_surface(RedWorker *worker, uint32_t surface_id, red_channel_push(&worker->display_channel->common.base); } - if (cursor_is_connected(worker) - && !COMMON_CHANNEL(worker->cursor_channel)->during_target_migrate) { - red_channel_pipes_add_type(RED_CHANNEL(worker->cursor_channel), - PIPE_ITEM_TYPE_CURSOR_INIT); - } + cursor_channel_init(worker->cursor_channel, NULL); } void handle_dev_create_primary_surface(void *opaque, void *payload) @@ -10289,12 +10285,7 @@ void handle_dev_cursor_migrate(void *opaque, void *payload) RedChannelClient *rcc = msg->rcc; spice_info("migrate cursor client"); - spice_assert(rcc); - if (!red_channel_client_is_connected(rcc)) - return; - - red_channel_client_pipe_add_type(rcc, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE); - red_channel_client_default_migrate(rcc); + cursor_channel_client_migrate(CURSOR_CHANNEL_CLIENT(rcc)); } void handle_dev_set_compression(void *opaque, void *payload) diff --git a/server/red_worker.h b/server/red_worker.h index e78d5c2d..d7a94fdf 100644 --- a/server/red_worker.h +++ b/server/red_worker.h @@ -33,6 +33,7 @@ typedef struct CommonChannelClient { int is_low_bandwidth; } CommonChannelClient; +#define COMMON_CHANNEL_CLIENT(Client) ((CommonChannelClient*)(Client)) #define DISPLAY_CLIENT_TIMEOUT 30000000000ULL //nano #define CHANNEL_RECEIVE_BUF_SIZE 1024 -- cgit