diff options
author | Alexander Larsson <alexl@redhat.com> | 2010-05-21 10:56:05 +0200 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2010-05-21 10:56:05 +0200 |
commit | d69b0829a6eea44939514ddef6aec62649e5b7eb (patch) | |
tree | 040a3fef0ad3358e04313f820b198a6a57579768 /server | |
parent | 012bd2577975b902aa5ce0cdd0eb43ef57c948fb (diff) | |
download | spice-d69b0829a6eea44939514ddef6aec62649e5b7eb.tar.gz spice-d69b0829a6eea44939514ddef6aec62649e5b7eb.tar.xz spice-d69b0829a6eea44939514ddef6aec62649e5b7eb.zip |
RedWorkeMessage -> RedWorkerMessage
Diffstat (limited to 'server')
-rw-r--r-- | server/red_dispatcher.c | 50 | ||||
-rw-r--r-- | server/red_worker.c | 16 | ||||
-rw-r--r-- | server/red_worker.h | 10 |
3 files changed, 38 insertions, 38 deletions
diff --git a/server/red_dispatcher.c b/server/red_dispatcher.c index 735d6c03..4368cf60 100644 --- a/server/red_dispatcher.c +++ b/server/red_dispatcher.c @@ -74,7 +74,7 @@ static void red_dispatcher_set_peer(Channel *channel, RedsStreamContext *peer, i red_printf(""); dispatcher = (RedDispatcher *)channel->data; - RedWorkeMessage message = RED_WORKER_MESSAGE_DISPLAY_CONNECT; + RedWorkerMessage message = RED_WORKER_MESSAGE_DISPLAY_CONNECT; write_message(dispatcher->channel, &message); send_data(dispatcher->channel, &peer, sizeof(RedsStreamContext *)); send_data(dispatcher->channel, &migration, sizeof(int)); @@ -84,7 +84,7 @@ static void red_dispatcher_shutdown_peer(Channel *channel) { RedDispatcher *dispatcher = (RedDispatcher *)channel->data; red_printf(""); - RedWorkeMessage message = RED_WORKER_MESSAGE_DISPLAY_DISCONNECT; + RedWorkerMessage message = RED_WORKER_MESSAGE_DISPLAY_DISCONNECT; write_message(dispatcher->channel, &message); } @@ -92,7 +92,7 @@ static void red_dispatcher_migrate(Channel *channel) { RedDispatcher *dispatcher = (RedDispatcher *)channel->data; red_printf("channel type %u id %u", channel->type, channel->id); - RedWorkeMessage message = RED_WORKER_MESSAGE_DISPLAY_MIGRATE; + RedWorkerMessage message = RED_WORKER_MESSAGE_DISPLAY_MIGRATE; write_message(dispatcher->channel, &message); } @@ -103,7 +103,7 @@ static void red_dispatcher_set_cursor_peer(Channel *channel, RedsStreamContext * { RedDispatcher *dispatcher = (RedDispatcher *)channel->data; red_printf(""); - RedWorkeMessage message = RED_WORKER_MESSAGE_CURSOR_CONNECT; + RedWorkerMessage message = RED_WORKER_MESSAGE_CURSOR_CONNECT; write_message(dispatcher->channel, &message); send_data(dispatcher->channel, &peer, sizeof(RedsStreamContext *)); send_data(dispatcher->channel, &migration, sizeof(int)); @@ -113,7 +113,7 @@ static void red_dispatcher_shutdown_cursor_peer(Channel *channel) { RedDispatcher *dispatcher = (RedDispatcher *)channel->data; red_printf(""); - RedWorkeMessage message = RED_WORKER_MESSAGE_CURSOR_DISCONNECT; + RedWorkerMessage message = RED_WORKER_MESSAGE_CURSOR_DISCONNECT; write_message(dispatcher->channel, &message); } @@ -121,7 +121,7 @@ static void red_dispatcher_cursor_migrate(Channel *channel) { RedDispatcher *dispatcher = (RedDispatcher *)channel->data; red_printf("channel type %u id %u", channel->type, channel->id); - RedWorkeMessage message = RED_WORKER_MESSAGE_CURSOR_MIGRATE; + RedWorkerMessage message = RED_WORKER_MESSAGE_CURSOR_MIGRATE; write_message(dispatcher->channel, &message); } @@ -204,7 +204,7 @@ static void qxl_worker_update_area(QXLWorker *qxl_worker, uint32_t surface_id, uint32_t num_dirty_rects, uint32_t clear_dirty_region) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_UPDATE; + RedWorkerMessage message = RED_WORKER_MESSAGE_UPDATE; write_message(dispatcher->channel, &message); send_data(dispatcher->channel, &surface_id, sizeof(uint32_t)); @@ -219,7 +219,7 @@ static void qxl_worker_update_area(QXLWorker *qxl_worker, uint32_t surface_id, static void qxl_worker_add_memslot(QXLWorker *qxl_worker, QXLDevMemSlot *mem_slot) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_ADD_MEMSLOT; + RedWorkerMessage message = RED_WORKER_MESSAGE_ADD_MEMSLOT; write_message(dispatcher->channel, &message); send_data(dispatcher->channel, mem_slot, sizeof(QXLDevMemSlot)); @@ -230,7 +230,7 @@ static void qxl_worker_add_memslot(QXLWorker *qxl_worker, QXLDevMemSlot *mem_slo static void qxl_worker_del_memslot(QXLWorker *qxl_worker, uint32_t slot_group_id, uint32_t slot_id) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_DEL_MEMSLOT; + RedWorkerMessage message = RED_WORKER_MESSAGE_DEL_MEMSLOT; write_message(dispatcher->channel, &message); send_data(dispatcher->channel, &slot_group_id, sizeof(uint32_t)); @@ -240,7 +240,7 @@ static void qxl_worker_del_memslot(QXLWorker *qxl_worker, uint32_t slot_group_id static void qxl_worker_destroy_surfaces(QXLWorker *qxl_worker) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_DESTROY_SURFACES; + RedWorkerMessage message = RED_WORKER_MESSAGE_DESTROY_SURFACES; write_message(dispatcher->channel, &message); read_message(dispatcher->channel, &message); @@ -250,7 +250,7 @@ static void qxl_worker_destroy_surfaces(QXLWorker *qxl_worker) static void qxl_worker_destroy_primary(QXLWorker *qxl_worker, uint32_t surface_id) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_DESTROY_PRIMARY_SURFACE; + RedWorkerMessage message = RED_WORKER_MESSAGE_DESTROY_PRIMARY_SURFACE; write_message(dispatcher->channel, &message); send_data(dispatcher->channel, &surface_id, sizeof(uint32_t)); @@ -269,7 +269,7 @@ static void qxl_worker_create_primary(QXLWorker *qxl_worker, uint32_t surface_id QXLDevSurfaceCreate *surface) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_CREATE_PRIMARY_SURFACE; + RedWorkerMessage message = RED_WORKER_MESSAGE_CREATE_PRIMARY_SURFACE; dispatcher->x_res = surface->width; dispatcher->y_res = surface->height; @@ -288,7 +288,7 @@ static void qxl_worker_create_primary(QXLWorker *qxl_worker, uint32_t surface_id static void qxl_worker_reset_image_cache(QXLWorker *qxl_worker) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_RESET_IMAGE_CACHE; + RedWorkerMessage message = RED_WORKER_MESSAGE_RESET_IMAGE_CACHE; write_message(dispatcher->channel, &message); read_message(dispatcher->channel, &message); @@ -298,7 +298,7 @@ static void qxl_worker_reset_image_cache(QXLWorker *qxl_worker) static void qxl_worker_reset_cursor(QXLWorker *qxl_worker) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_RESET_CURSOR; + RedWorkerMessage message = RED_WORKER_MESSAGE_RESET_CURSOR; write_message(dispatcher->channel, &message); read_message(dispatcher->channel, &message); @@ -308,7 +308,7 @@ static void qxl_worker_reset_cursor(QXLWorker *qxl_worker) static void qxl_worker_destroy_surface_wait(QXLWorker *qxl_worker, uint32_t surface_id) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_DESTROY_SURFACE_WAIT; + RedWorkerMessage message = RED_WORKER_MESSAGE_DESTROY_SURFACE_WAIT; write_message(dispatcher->channel, &message); send_data(dispatcher->channel, &surface_id, sizeof(uint32_t)); @@ -319,7 +319,7 @@ static void qxl_worker_destroy_surface_wait(QXLWorker *qxl_worker, uint32_t surf static void qxl_worker_reset_memslots(QXLWorker *qxl_worker) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_RESET_MEMSLOTS; + RedWorkerMessage message = RED_WORKER_MESSAGE_RESET_MEMSLOTS; write_message(dispatcher->channel, &message); } @@ -329,7 +329,7 @@ static void qxl_worker_wakeup(QXLWorker *qxl_worker) RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; if (!test_bit(RED_WORKER_PENDING_WAKEUP, dispatcher->pending)) { - RedWorkeMessage message = RED_WORKER_MESSAGE_WAKEUP; + RedWorkerMessage message = RED_WORKER_MESSAGE_WAKEUP; set_bit(RED_WORKER_PENDING_WAKEUP, &dispatcher->pending); write_message(dispatcher->channel, &message); } @@ -339,7 +339,7 @@ static void qxl_worker_oom(QXLWorker *qxl_worker) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; if (!test_bit(RED_WORKER_PENDING_OOM, dispatcher->pending)) { - RedWorkeMessage message = RED_WORKER_MESSAGE_OOM; + RedWorkerMessage message = RED_WORKER_MESSAGE_OOM; set_bit(RED_WORKER_PENDING_OOM, &dispatcher->pending); write_message(dispatcher->channel, &message); } @@ -348,7 +348,7 @@ static void qxl_worker_oom(QXLWorker *qxl_worker) static void qxl_worker_start(QXLWorker *qxl_worker) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_START; + RedWorkerMessage message = RED_WORKER_MESSAGE_START; write_message(dispatcher->channel, &message); } @@ -356,7 +356,7 @@ static void qxl_worker_start(QXLWorker *qxl_worker) static void qxl_worker_stop(QXLWorker *qxl_worker) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_STOP; + RedWorkerMessage message = RED_WORKER_MESSAGE_STOP; write_message(dispatcher->channel, &message); read_message(dispatcher->channel, &message); @@ -367,7 +367,7 @@ void qxl_worker_loadvm_commands(QXLWorker *qxl_worker, struct QXLCommandExt *ext, uint32_t count) { RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; - RedWorkeMessage message = RED_WORKER_MESSAGE_LOADVM_COMMANDS; + RedWorkerMessage message = RED_WORKER_MESSAGE_LOADVM_COMMANDS; red_printf(""); write_message(dispatcher->channel, &message); @@ -402,7 +402,7 @@ void red_dispatcher_on_ic_change() int compression_level = calc_compression_level(); RedDispatcher *now = dispatchers; while (now) { - RedWorkeMessage message = RED_WORKER_MESSAGE_SET_COMPRESSION; + RedWorkerMessage message = RED_WORKER_MESSAGE_SET_COMPRESSION; now->qxl->st->qif->set_compression_level(now->qxl, compression_level); write_message(now->channel, &message); send_data(now->channel, &image_compression, sizeof(spice_image_compression_t)); @@ -415,7 +415,7 @@ void red_dispatcher_on_sv_change() int compression_level = calc_compression_level(); RedDispatcher *now = dispatchers; while (now) { - RedWorkeMessage message = RED_WORKER_MESSAGE_SET_STREAMING_VIDEO; + RedWorkerMessage message = RED_WORKER_MESSAGE_SET_STREAMING_VIDEO; now->qxl->st->qif->set_compression_level(now->qxl, compression_level); write_message(now->channel, &message); send_data(now->channel, &streaming_video, sizeof(uint32_t)); @@ -427,7 +427,7 @@ void red_dispatcher_set_mouse_mode(uint32_t mode) { RedDispatcher *now = dispatchers; while (now) { - RedWorkeMessage message = RED_WORKER_MESSAGE_SET_MOUSE_MODE; + RedWorkerMessage message = RED_WORKER_MESSAGE_SET_MOUSE_MODE; write_message(now->channel, &message); send_data(now->channel, &mode, sizeof(uint32_t)); now = now->next; @@ -460,7 +460,7 @@ RedDispatcher *red_dispatcher_init(QXLInstance *qxl) { RedDispatcher *dispatcher; int channels[2]; - RedWorkeMessage message; + RedWorkerMessage message; WorkerInitData init_data; QXLDevInitInfo init_info; int r; diff --git a/server/red_worker.c b/server/red_worker.c index c89adf18..e31c3042 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -8940,7 +8940,7 @@ static void red_wait_outgoiong_item(RedChannel *channel) static inline void handle_dev_update(RedWorker *worker) { - RedWorkeMessage message; + RedWorkerMessage message; const SpiceRect *rect; SpiceRect *dirty_rects; RedSurface *surface; @@ -8975,7 +8975,7 @@ static inline void handle_dev_update(RedWorker *worker) static inline void handle_dev_add_memslot(RedWorker *worker) { - RedWorkeMessage message; + RedWorkerMessage message; QXLDevMemSlot dev_slot; receive_data(worker->channel, &dev_slot, sizeof(QXLDevMemSlot)); @@ -9016,7 +9016,7 @@ static inline void destroy_surface_wait(RedWorker *worker, int surface_id) static inline void handle_dev_destroy_surface_wait(RedWorker *worker) { - RedWorkeMessage message; + RedWorkerMessage message; uint32_t surface_id; receive_data(worker->channel, &surface_id, sizeof(uint32_t)); @@ -9035,7 +9035,7 @@ static inline void handle_dev_destroy_surface_wait(RedWorker *worker) static inline void handle_dev_destroy_surfaces(RedWorker *worker) { int i; - RedWorkeMessage message; + RedWorkerMessage message; flush_display_commands(worker); //to handle better @@ -9084,7 +9084,7 @@ static inline void handle_dev_destroy_surfaces(RedWorker *worker) static inline void handle_dev_create_primary_surface(RedWorker *worker) { - RedWorkeMessage message; + RedWorkerMessage message; uint32_t surface_id; QXLDevSurfaceCreate surface; uint8_t *line_0; @@ -9121,7 +9121,7 @@ static inline void handle_dev_create_primary_surface(RedWorker *worker) static inline void handle_dev_destroy_primary_surface(RedWorker *worker) { - RedWorkeMessage message; + RedWorkerMessage message; uint32_t surface_id; receive_data(worker->channel, &surface_id, sizeof(uint32_t)); @@ -9161,7 +9161,7 @@ static inline void handle_dev_destroy_primary_surface(RedWorker *worker) static void handle_dev_input(EventListener *listener, uint32_t events) { RedWorker *worker = SPICE_CONTAINEROF(listener, RedWorker, dev_listener); - RedWorkeMessage message; + RedWorkerMessage message; read_message(worker->channel, &message); @@ -9397,7 +9397,7 @@ static void handle_dev_input(EventListener *listener, uint32_t events) static void red_init(RedWorker *worker, WorkerInitData *init_data) { struct epoll_event event; - RedWorkeMessage message; + RedWorkerMessage message; int epoll; static SpiceVirtMappingOps preload_group_virt_mapping_ops = { op_get_virt_preload_group, diff --git a/server/red_worker.h b/server/red_worker.h index 88c1e90c..6f87471b 100644 --- a/server/red_worker.h +++ b/server/red_worker.h @@ -70,7 +70,7 @@ enum { RED_WORKER_MESSAGE_LOADVM_COMMANDS, }; -typedef uint32_t RedWorkeMessage; +typedef uint32_t RedWorkerMessage; #define RED_MAX_RENDERERS 4 @@ -116,9 +116,9 @@ static inline void send_data(int fd, void *in_buf, int n) } while (n); } -static inline void write_message(int fd, RedWorkeMessage *message) +static inline void write_message(int fd, RedWorkerMessage *message) { - send_data(fd, message, sizeof(RedWorkeMessage)); + send_data(fd, message, sizeof(RedWorkerMessage)); } static inline void receive_data(int fd, void *in_buf, int n) @@ -137,9 +137,9 @@ static inline void receive_data(int fd, void *in_buf, int n) } while (n); } -static inline void read_message(int fd, RedWorkeMessage *message) +static inline void read_message(int fd, RedWorkerMessage *message) { - receive_data(fd, message, sizeof(RedWorkeMessage)); + receive_data(fd, message, sizeof(RedWorkerMessage)); } #endif |