[Spice-devel] [PATCH 17/23] server/red_worker: s/red_pipe_add_type/red_channel_pipe_add_type/
Alon Levy
alevy at redhat.com
Fri Feb 11 09:23:05 PST 2011
---
server/red_client_shared_cache.h | 2 +-
server/red_worker.c | 37 +++++++++++++++----------------------
2 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/server/red_client_shared_cache.h b/server/red_client_shared_cache.h
index 4d50fe4..75112c3 100644
--- a/server/red_client_shared_cache.h
+++ b/server/red_client_shared_cache.h
@@ -94,7 +94,7 @@ static int FUNC_NAME(add)(CACHE *cache, uint64_t id, uint32_t size, int lossy, C
if (cache->generation != channel->CACH_GENERATION) {
if (!channel->pending_pixmaps_sync) {
- red_pipe_add_type((RedChannel *)channel, PIPE_ITEM_TYPE_PIXMAP_SYNC);
+ red_channel_pipe_add_type((RedChannel *)channel, PIPE_ITEM_TYPE_PIXMAP_SYNC);
channel->pending_pixmaps_sync = TRUE;
}
pthread_mutex_unlock(&cache->lock);
diff --git a/server/red_worker.c b/server/red_worker.c
index c663424..a582562 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -1154,13 +1154,6 @@ static void red_pipe_add_verb(RedChannel* channel, uint16_t verb)
red_channel_pipe_add(channel, &item->base);
}
-static void red_pipe_add_type(RedChannel* channel, int pipe_item_type)
-{
- PipeItem *item = spice_new(PipeItem, 1);
- red_pipe_item_init(item, pipe_item_type);
- red_channel_pipe_add(channel, item);
-}
-
static inline void red_create_surface_item(RedWorker *worker, int surface_id);
static void red_add_surface_image(RedWorker *worker, int surface_id);
@@ -8358,7 +8351,7 @@ static void red_migrate_display(RedWorker *worker)
{
if (worker->display_channel) {
red_pipe_add_verb(&worker->display_channel->common.base, SPICE_MSG_DISPLAY_STREAM_DESTROY_ALL);
- red_pipe_add_type(&worker->display_channel->common.base, PIPE_ITEM_TYPE_MIGRATE);
+ red_channel_pipe_add_type(&worker->display_channel->common.base, PIPE_ITEM_TYPE_MIGRATE);
}
}
@@ -8646,7 +8639,7 @@ static void push_new_primary_surface(RedWorker *worker)
DisplayChannel *display_channel;
if ((display_channel = worker->display_channel)) {
- red_pipe_add_type(&display_channel->common.base, PIPE_ITEM_TYPE_INVAL_PALLET_CACHE);
+ red_channel_pipe_add_type(&display_channel->common.base, PIPE_ITEM_TYPE_INVAL_PALLET_CACHE);
if (!display_channel->common.base.migrate) {
red_create_surface_item(worker, 0);
}
@@ -8688,7 +8681,7 @@ static void on_new_display_channel(RedWorker *worker)
DisplayChannel *display_channel = worker->display_channel;
ASSERT(display_channel);
- red_pipe_add_type(&display_channel->common.base, PIPE_ITEM_TYPE_SET_ACK);
+ red_channel_pipe_add_type(&display_channel->common.base, PIPE_ITEM_TYPE_SET_ACK);
if (display_channel->common.base.migrate) {
display_channel->expect_migrate_data = TRUE;
@@ -8940,7 +8933,7 @@ static int display_channel_handle_migrate_mark(DisplayChannel *channel)
return FALSE;
}
channel->expect_migrate_mark = FALSE;
- red_pipe_add_type((RedChannel *)channel, PIPE_ITEM_TYPE_MIGRATE_DATA);
+ red_channel_pipe_add_type((RedChannel *)channel, PIPE_ITEM_TYPE_MIGRATE_DATA);
return TRUE;
}
@@ -8978,7 +8971,7 @@ static int display_channel_handle_migrate_data(DisplayChannel *channel, size_t s
if (migrate_data->pixmap_cache_freezer) {
channel->pixmap_cache->size = migrate_data->pixmap_cache_size;
- red_pipe_add_type((RedChannel *)channel, PIPE_ITEM_TYPE_PIXMAP_RESET);
+ red_channel_pipe_add_type((RedChannel *)channel, PIPE_ITEM_TYPE_PIXMAP_RESET);
}
if (display_channel_handle_migrate_glz_dictionary(channel, migrate_data)) {
@@ -8991,7 +8984,7 @@ static int display_channel_handle_migrate_data(DisplayChannel *channel, size_t s
PANIC("restoring global lz dictionary failed");
}
- red_pipe_add_type((RedChannel *)channel, PIPE_ITEM_TYPE_INVAL_PALLET_CACHE);
+ red_channel_pipe_add_type((RedChannel *)channel, PIPE_ITEM_TYPE_INVAL_PALLET_CACHE);
channel->common.base.ack_data.messages_window = 0;
return TRUE;
@@ -9278,8 +9271,8 @@ static void red_disconnect_cursor(RedChannel *channel)
static void red_migrate_cursor(RedWorker *worker)
{
if (worker->cursor_channel) {
- red_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE);
- red_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_MIGRATE);
+ red_channel_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE);
+ red_channel_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_MIGRATE);
}
}
@@ -9290,9 +9283,9 @@ static void on_new_cursor_channel(RedWorker *worker)
ASSERT(channel);
channel->common.base.ack_data.messages_window = 0;
- red_pipe_add_type(&channel->common.base, PIPE_ITEM_TYPE_SET_ACK);
+ red_channel_pipe_add_type(&channel->common.base, PIPE_ITEM_TYPE_SET_ACK);
if (worker->surfaces[0].context.canvas && !channel->common.base.migrate) {
- red_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_CURSOR_INIT);
+ red_channel_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_CURSOR_INIT);
}
}
@@ -9591,7 +9584,7 @@ static inline void handle_dev_destroy_surfaces(RedWorker *worker)
red_wait_outgoing_item((RedChannel *)worker->cursor_channel);
if (worker->cursor_channel) {
- red_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE);
+ red_channel_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE);
if (!worker->cursor_channel->common.base.migrate) {
red_pipe_add_verb(&worker->cursor_channel->common.base, SPICE_MSG_CURSOR_RESET);
}
@@ -9599,7 +9592,7 @@ static inline void handle_dev_destroy_surfaces(RedWorker *worker)
}
if (worker->display_channel) {
- red_pipe_add_type(&worker->display_channel->common.base, PIPE_ITEM_TYPE_INVAL_PALLET_CACHE);
+ red_channel_pipe_add_type(&worker->display_channel->common.base, PIPE_ITEM_TYPE_INVAL_PALLET_CACHE);
red_pipe_add_verb(&worker->display_channel->common.base, SPICE_MSG_DISPLAY_STREAM_DESTROY_ALL);
}
@@ -9643,7 +9636,7 @@ static inline void handle_dev_create_primary_surface(RedWorker *worker)
}
if (worker->cursor_channel) {
- red_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_CURSOR_INIT);
+ red_channel_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_CURSOR_INIT);
}
message = RED_WORKER_MESSAGE_READY;
@@ -9667,7 +9660,7 @@ static inline void handle_dev_destroy_primary_surface(RedWorker *worker)
red_wait_outgoing_item((RedChannel *)worker->cursor_channel);
if (worker->cursor_channel) {
- red_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE);
+ red_channel_pipe_add_type(&worker->cursor_channel->common.base, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE);
if (!worker->cursor_channel->common.base.migrate) {
red_pipe_add_verb(&worker->cursor_channel->common.base, SPICE_MSG_CURSOR_RESET);
}
@@ -9729,7 +9722,7 @@ static void handle_dev_input(EventListener *listener, uint32_t events)
red_wait_outgoing_item((RedChannel *)worker->cursor_channel);
if (worker->cursor_channel) {
- red_pipe_add_type(cursor_red_channel, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE);
+ red_channel_pipe_add_type(cursor_red_channel, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE);
if (!cursor_red_channel->migrate) {
red_pipe_add_verb(cursor_red_channel, SPICE_MSG_CURSOR_RESET);
}
--
1.7.4
More information about the Spice-devel
mailing list