diff options
author | Alexander Larsson <alexl@redhat.com> | 2010-07-08 18:26:37 +0200 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2010-07-08 18:26:37 +0200 |
commit | 1a6e77d6d4da9c73dc706574ea3e3fbaa8142f29 (patch) | |
tree | 4299cdcfbdf378b575948f0870ef6c365a9e8095 /server | |
parent | 925f6387c8b5bd63ecd128c9187d8424607e0fa8 (diff) | |
download | spice-1a6e77d6d4da9c73dc706574ea3e3fbaa8142f29.tar.gz spice-1a6e77d6d4da9c73dc706574ea3e3fbaa8142f29.tar.xz spice-1a6e77d6d4da9c73dc706574ea3e3fbaa8142f29.zip |
Fix various misspellings
letancy -> latency
compund -> compound
SpicedSubMessage -> SpiceSubMessage
modifaiers -> modifiers
massage -> message
outgoiong -> outgoing
AlphaBlnd -> AlphaBlend
remoth -> remote
modifires -> modifiers
secore -> secure
Diffstat (limited to 'server')
-rw-r--r-- | server/Makefile.am | 2 | ||||
-rw-r--r-- | server/red_channel.c | 2 | ||||
-rw-r--r-- | server/red_channel.h | 4 | ||||
-rw-r--r-- | server/red_parse_qxl.c | 6 | ||||
-rw-r--r-- | server/red_parse_qxl.h | 2 | ||||
-rw-r--r-- | server/red_worker.c | 84 | ||||
-rw-r--r-- | server/reds.c | 20 |
7 files changed, 60 insertions, 60 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index d82f4cf6..a12009c3 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -22,7 +22,7 @@ spice_built_sources = generated_marshallers.c generated_marshallers.h generated_ generated_demarshallers.c: $(top_srcdir)/spice.proto $(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --server --include red_common.h $(top_srcdir)/spice.proto generated_demarshallers.c -STRUCTS=-M String -M Rect -M Point -M DisplayBase -M Fill -M Opaque -M Copy -M Blend -M Blackness -M Whiteness -M Invers -M Rop3 -M Stroke -M Text -M Transparent -M AlphaBlnd +STRUCTS=-M String -M Rect -M Point -M DisplayBase -M Fill -M Opaque -M Copy -M Blend -M Blackness -M Whiteness -M Invers -M Rop3 -M Stroke -M Text -M Transparent -M AlphaBlend generated_marshallers.c: $(top_srcdir)/spice.proto $(PYTHON) $(top_srcdir)/spice_codegen.py --include red_common.h --generate-marshallers $(STRUCTS) --server $(top_srcdir)/spice.proto generated_marshallers.c diff --git a/server/red_channel.c b/server/red_channel.c index 9f02822a..f547f5ac 100644 --- a/server/red_channel.c +++ b/server/red_channel.c @@ -406,7 +406,7 @@ static void red_channel_send(RedChannel *channel) red_peer_handle_outgoing(channel->peer, &channel->outgoing); } -void red_channel_begin_send_massage(RedChannel *channel) +void red_channel_begin_send_message(RedChannel *channel) { channel->send_data.size = channel->send_data.header.size + sizeof(SpiceDataHeader); channel->ack_data.messages_window++; diff --git a/server/red_channel.h b/server/red_channel.h index c53bf6d6..509da775 100644 --- a/server/red_channel.h +++ b/server/red_channel.h @@ -169,8 +169,8 @@ void red_channel_add_buf(RedChannel *channel, void *data, uint32_t size); uint64_t red_channel_get_message_serial(RedChannel *channel); -/* when sending a msg. should first call red_channel_begin_send_massage */ -void red_channel_begin_send_massage(RedChannel *channel); +/* when sending a msg. should first call red_channel_begin_send_message */ +void red_channel_begin_send_message(RedChannel *channel); void red_channel_pipe_item_init(RedChannel *channel, PipeItem *item, int type); void red_channel_pipe_add(RedChannel *channel, PipeItem *item); diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c index 09f6b908..127141c6 100644 --- a/server/red_parse_qxl.c +++ b/server/red_parse_qxl.c @@ -515,7 +515,7 @@ static void red_put_transparent(SpiceTransparent *red) } static void red_get_alpha_blend_ptr(RedMemSlotInfo *slots, int group_id, - SpiceAlphaBlnd *red, QXLAlphaBlnd *qxl) + SpiceAlphaBlend *red, QXLAlphaBlend *qxl) { red->alpha_flags = qxl->alpha_flags; red->alpha = qxl->alpha; @@ -524,14 +524,14 @@ static void red_get_alpha_blend_ptr(RedMemSlotInfo *slots, int group_id, } static void red_get_alpha_blend_ptr_compat(RedMemSlotInfo *slots, int group_id, - SpiceAlphaBlnd *red, QXLCompatAlphaBlnd *qxl) + SpiceAlphaBlend *red, QXLCompatAlphaBlend *qxl) { red->alpha = qxl->alpha; red->src_bitmap = red_get_image(slots, group_id, qxl->src_bitmap); red_get_rect_ptr(&red->src_area, &qxl->src_area); } -static void red_put_alpha_blend(SpiceAlphaBlnd *red) +static void red_put_alpha_blend(SpiceAlphaBlend *red) { red_put_image(red->src_bitmap); } diff --git a/server/red_parse_qxl.h b/server/red_parse_qxl.h index 0d713e86..e80da8a5 100644 --- a/server/red_parse_qxl.h +++ b/server/red_parse_qxl.h @@ -40,7 +40,7 @@ typedef struct RedDrawable { SpiceOpaque opaque; SpiceCopy copy; SpiceTransparent transparent; - SpiceAlphaBlnd alpha_blend; + SpiceAlphaBlend alpha_blend; struct { SpicePoint src_pos; } copy_bits; diff --git a/server/red_worker.c b/server/red_worker.c index dfd445ae..786387f2 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -992,8 +992,8 @@ static inline void red_detach_stream(RedWorker *worker, Stream *stream); #endif static void red_stop_stream(RedWorker *worker, Stream *stream); static inline void red_stream_maintenance(RedWorker *worker, Drawable *candidate, Drawable *sect); -static inline void red_begin_send_massage(RedChannel *channel, void *item); -static inline void display_begin_send_massage(DisplayChannel *channel, void *item); +static inline void red_begin_send_message(RedChannel *channel, void *item); +static inline void display_begin_send_message(DisplayChannel *channel, void *item); static void red_receive(RedChannel *channel); static void red_release_pixmap_cache(DisplayChannel *channel); static void red_release_glz(DisplayChannel *channel); @@ -4145,7 +4145,7 @@ static void red_draw_qxl_drawable(RedWorker *worker, Drawable *drawable) break; } case QXL_DRAW_ALPHA_BLEND: { - SpiceAlphaBlnd alpha_blend = drawable->red_drawable->u.alpha_blend; + SpiceAlphaBlend alpha_blend = drawable->red_drawable->u.alpha_blend; SpiceImage img1; localize_bitmap(worker, &alpha_blend.src_bitmap, &img1); canvas->ops->draw_alpha_blend(canvas, @@ -7098,15 +7098,15 @@ static FillBitsType red_send_qxl_draw_alpha_blend(RedWorker *worker, RedChannel *channel = &display_channel->base; RedDrawable *drawable = item->red_drawable; SpiceMarshaller *src_bitmap_out; - SpiceAlphaBlnd alpha_blend; + SpiceAlphaBlend alpha_blend; FillBitsType src_send_type; fill_base(display_channel, item); channel->send_data.header->type = SPICE_MSG_DISPLAY_DRAW_ALPHA_BLEND; alpha_blend = drawable->u.alpha_blend; - spice_marshall_AlphaBlnd(channel->send_data.marshaller, - &alpha_blend, - &src_bitmap_out); + spice_marshall_AlphaBlend(channel->send_data.marshaller, + &alpha_blend, + &src_bitmap_out); src_send_type = fill_bits(display_channel, src_bitmap_out, alpha_blend.src_bitmap, item, src_allowed_lossy); return src_send_type; @@ -7636,7 +7636,7 @@ static void red_lossy_send_qxl_drawable(RedWorker *worker, DisplayChannel *displ // a message is pending if (display_channel->base.send_data.header->type != 0) { - display_begin_send_massage(display_channel, &item->pipe_item); + display_begin_send_message(display_channel, &item->pipe_item); } } @@ -7688,7 +7688,7 @@ static inline void red_send_qxl_drawable(RedWorker *worker, DisplayChannel *disp default: red_error("invalid type"); } - display_begin_send_massage(display_channel, &item->pipe_item); + display_begin_send_message(display_channel, &item->pipe_item); } #define MAX_SEND_VEC 100 @@ -7770,7 +7770,7 @@ static void display_channel_push_release(DisplayChannel *channel, uint8_t type, free_list->res->resources[free_list->res->count++].id = id; } -static inline void red_begin_send_massage(RedChannel *channel, void *item) +static inline void red_begin_send_message(RedChannel *channel, void *item) { spice_marshaller_flush(channel->send_data.marshaller); channel->send_data.size = spice_marshaller_get_total_size(channel->send_data.marshaller); @@ -7780,7 +7780,7 @@ static inline void red_begin_send_massage(RedChannel *channel, void *item) red_send_data(channel, item); } -static inline void display_begin_send_massage(DisplayChannel *channel, void *item) +static inline void display_begin_send_message(DisplayChannel *channel, void *item) { FreeList *free_list = &channel->send_data.free_list; @@ -7827,7 +7827,7 @@ static inline void display_begin_send_massage(DisplayChannel *channel, void *ite spice_marshaller_add_uint32(sub_list_m, spice_marshaller_get_offset(inval_m)); channel->base.send_data.header->sub_list = spice_marshaller_get_offset(sub_list_m); } - red_begin_send_massage((RedChannel *)channel, item); + red_begin_send_message((RedChannel *)channel, item); } static inline RedChannel *red_ref_channel(RedChannel *channel) @@ -8105,7 +8105,7 @@ static inline int red_send_stream_data(DisplayChannel *display_channel, Drawable spice_marshaller_add_ref(channel->send_data.marshaller, display_channel->send_data.stream_outbuf, n + PADDING); - display_begin_send_massage(display_channel, NULL); + display_begin_send_message(display_channel, NULL); agent->lats_send_time = time_now; return TRUE; } @@ -8138,21 +8138,21 @@ static void red_send_set_ack(RedChannel *channel) spice_marshall_msg_set_ack(channel->send_data.marshaller, &ack); - red_begin_send_massage(channel, NULL); + red_begin_send_message(channel, NULL); } static inline void red_send_verb(RedChannel *channel, uint16_t verb) { ASSERT(channel); channel->send_data.header->type = verb; - red_begin_send_massage(channel, NULL); + red_begin_send_message(channel, NULL); } static inline void display_send_verb(DisplayChannel *channel, uint16_t verb) { ASSERT(channel); channel->base.send_data.header->type = verb; - display_begin_send_massage(channel, NULL); + display_begin_send_message(channel, NULL); } static inline void __red_send_inval(RedChannel *channel, CacheItem *cach_item) @@ -8168,13 +8168,13 @@ static inline void __red_send_inval(RedChannel *channel, CacheItem *cach_item) static void red_send_inval(RedChannel *channel, CacheItem *cach_item) { __red_send_inval(channel, cach_item); - red_begin_send_massage(channel, NULL); + red_begin_send_message(channel, NULL); } static void red_display_send_inval(DisplayChannel *display_channel, CacheItem *cach_item) { __red_send_inval((RedChannel *)display_channel, cach_item); - display_begin_send_massage(display_channel, NULL); + display_begin_send_message(display_channel, NULL); } static void display_channel_send_migrate(DisplayChannel *display_channel) @@ -8185,7 +8185,7 @@ static void display_channel_send_migrate(DisplayChannel *display_channel) migrate.flags = SPICE_MIGRATE_NEED_FLUSH | SPICE_MIGRATE_NEED_DATA_TRANSFER; spice_marshall_msg_migrate(display_channel->base.send_data.marshaller, &migrate); display_channel->expect_migrate_mark = TRUE; - display_begin_send_massage(display_channel, NULL); + display_begin_send_message(display_channel, NULL); } static void display_channel_send_migrate_data(DisplayChannel *display_channel) @@ -8216,7 +8216,7 @@ static void display_channel_send_migrate_data(DisplayChannel *display_channel) spice_marshaller_add_ref(display_channel->base.send_data.marshaller, (uint8_t *)&display_data, sizeof(display_data)); - display_begin_send_massage(display_channel, NULL); + display_begin_send_message(display_channel, NULL); } static void display_channel_pixmap_sync(DisplayChannel *display_channel) @@ -8242,7 +8242,7 @@ static void display_channel_pixmap_sync(DisplayChannel *display_channel) spice_marshall_msg_wait_for_channels(display_channel->base.send_data.marshaller, &wait); - display_begin_send_massage(display_channel, NULL); + display_begin_send_message(display_channel, NULL); } static void display_channel_reset_cache(DisplayChannel *display_channel) @@ -8254,7 +8254,7 @@ static void display_channel_reset_cache(DisplayChannel *display_channel) spice_marshall_msg_display_inval_all_pixmaps(display_channel->base.send_data.marshaller, &wait); - display_begin_send_massage(display_channel, NULL); + display_begin_send_message(display_channel, NULL); } static void red_send_image(DisplayChannel *display_channel, ImageItem *item) @@ -8388,7 +8388,7 @@ static void red_send_image(DisplayChannel *display_channel, ImageItem *item) spice_marshaller_add_ref(data_out, item->data, bitmap.y * bitmap.stride); region_remove(surface_lossy_region, ©.base.box); } - display_begin_send_massage(display_channel, &item->link); + display_begin_send_message(display_channel, &item->link); spice_chunks_destroy(chunks); } @@ -8423,7 +8423,7 @@ static void red_display_send_upgrade(DisplayChannel *display_channel, UpgradeIte fill_bits(display_channel, src_bitmap_out, copy.data.src_bitmap, item->drawable, FALSE); - display_begin_send_massage(display_channel, &item->base); + display_begin_send_message(display_channel, &item->base); } static void red_display_send_stream_start(DisplayChannel *display_channel, StreamAgent *agent) @@ -8461,9 +8461,9 @@ static void red_display_send_stream_start(DisplayChannel *display_channel, Strea if (stream->current) { - display_begin_send_massage(display_channel, &stream->current->pipe_item); + display_begin_send_message(display_channel, &stream->current->pipe_item); } else { - display_begin_send_massage(display_channel, NULL); + display_begin_send_message(display_channel, NULL); } } @@ -8486,7 +8486,7 @@ static void red_display_send_stream_clip(DisplayChannel *display_channel, spice_marshall_msg_display_stream_clip(channel->send_data.marshaller, &stream_clip); - display_begin_send_massage(display_channel, item); + display_begin_send_message(display_channel, item); } static void red_display_send_stream_end(DisplayChannel *display_channel, StreamAgent* agent) @@ -8499,7 +8499,7 @@ static void red_display_send_stream_end(DisplayChannel *display_channel, StreamA spice_marshall_msg_display_stream_destroy(channel->send_data.marshaller, &destroy); - display_begin_send_massage(display_channel, NULL); + display_begin_send_message(display_channel, NULL); } static void red_cursor_send_inval(CursorChannel *channel, CacheItem *cach_item) @@ -8528,7 +8528,7 @@ static void red_send_cursor_init(CursorChannel *channel) spice_marshall_msg_cursor_init(channel->base.send_data.marshaller, &msg); add_buf_from_info(&channel->base, channel->base.send_data.marshaller, &info); - red_begin_send_massage(&channel->base, worker->cursor); + red_begin_send_message(&channel->base, worker->cursor); } static void red_send_local_cursor(CursorChannel *cursor_channel, LocalCursor *cursor) @@ -8548,7 +8548,7 @@ static void red_send_local_cursor(CursorChannel *cursor_channel, LocalCursor *cu spice_marshall_msg_cursor_set(channel->send_data.marshaller, &cursor_set); add_buf_from_info(channel, channel->send_data.marshaller, &info); - red_begin_send_massage(channel, cursor); + red_begin_send_message(channel, cursor); red_release_cursor(channel->worker, (CursorItem *)cursor); } @@ -8561,7 +8561,7 @@ static void cursor_channel_send_migrate(CursorChannel *cursor_channel) migrate.flags = 0; spice_marshall_msg_migrate(cursor_channel->base.send_data.marshaller, &migrate); - red_begin_send_massage((RedChannel*)cursor_channel, NULL); + red_begin_send_message((RedChannel*)cursor_channel, NULL); } static void red_send_cursor(CursorChannel *cursor_channel, CursorItem *cursor) @@ -8616,7 +8616,7 @@ static void red_send_cursor(CursorChannel *cursor_channel, CursorItem *cursor) red_error("bad cursor command %d", cmd->type); } - red_begin_send_massage(channel, cursor); + red_begin_send_message(channel, cursor); red_release_cursor(channel->worker, cursor); } @@ -8633,7 +8633,7 @@ static void red_send_surface_create(DisplayChannel *display, SpiceMsgSurfaceCrea spice_marshall_msg_display_surface_create(channel->send_data.marshaller, surface_create); - red_begin_send_massage(channel, NULL); + red_begin_send_message(channel, NULL); } static void red_send_surface_destroy(DisplayChannel *display, uint32_t surface_id) @@ -8651,7 +8651,7 @@ static void red_send_surface_destroy(DisplayChannel *display, uint32_t surface_i spice_marshall_msg_display_surface_destroy(channel->send_data.marshaller, &surface_destroy); - red_begin_send_massage(channel, NULL); + red_begin_send_message(channel, NULL); } static inline PipeItem *red_pipe_get(RedChannel *channel) @@ -9135,7 +9135,7 @@ static inline void red_create_surface(RedWorker *worker, uint32_t surface_id, ui PANIC("unable to create drawing canvas"); } -static void red_wait_outgoiong_item(RedChannel *channel); +static void red_wait_outgoing_item(RedChannel *channel); static inline void flush_display_commands(RedWorker *worker) { @@ -10033,7 +10033,7 @@ static void red_cursor_flush(RedWorker *worker) red_release_cursor(worker, &local->base); } -static void red_wait_outgoiong_item(RedChannel *channel) +static void red_wait_outgoing_item(RedChannel *channel) { uint64_t end_time; int blocked; @@ -10129,7 +10129,7 @@ static inline void destroy_surface_wait(RedWorker *worker, int surface_id) red_current_clear(worker, surface_id); red_clear_surface_glz_drawables(worker, surface_id); red_clear_surface_drawables_from_pipe(worker, surface_id); - red_wait_outgoiong_item((RedChannel *)worker->display_channel); + red_wait_outgoing_item((RedChannel *)worker->display_channel); if (worker->display_channel) { ASSERT(!worker->display_channel->base.send_data.item); } @@ -10174,7 +10174,7 @@ static inline void handle_dev_destroy_surfaces(RedWorker *worker) } ASSERT(ring_is_empty(&worker->streams)); - red_wait_outgoiong_item((RedChannel *)worker->cursor_channel); + red_wait_outgoing_item((RedChannel *)worker->cursor_channel); if (worker->cursor_channel) { red_pipe_add_type(&worker->cursor_channel->base, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE); if (!worker->cursor_channel->base.migrate) { @@ -10253,7 +10253,7 @@ static inline void handle_dev_destroy_primary_surface(RedWorker *worker) worker->cursor = NULL; } - red_wait_outgoiong_item((RedChannel *)worker->cursor_channel); + red_wait_outgoing_item((RedChannel *)worker->cursor_channel); if (worker->cursor_channel) { red_pipe_add_type(&worker->cursor_channel->base, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE); if (!worker->cursor_channel->base.migrate) { @@ -10311,7 +10311,7 @@ static void handle_dev_input(EventListener *listener, uint32_t events) worker->cursor = NULL; } - red_wait_outgoiong_item((RedChannel *)worker->cursor_channel); + red_wait_outgoing_item((RedChannel *)worker->cursor_channel); if (worker->cursor_channel) { red_pipe_add_type(&worker->cursor_channel->base, PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE); if (!worker->cursor_channel->base.migrate) { @@ -10371,8 +10371,8 @@ static void handle_dev_input(EventListener *listener, uint32_t events) } } red_cursor_flush(worker); - red_wait_outgoiong_item((RedChannel *)worker->display_channel); - red_wait_outgoiong_item((RedChannel *)worker->cursor_channel); + red_wait_outgoing_item((RedChannel *)worker->display_channel); + red_wait_outgoing_item((RedChannel *)worker->cursor_channel); message = RED_WORKER_MESSAGE_READY; write_message(worker->channel, &message); break; diff --git a/server/reds.c b/server/reds.c index 8c16896e..1a227aeb 100644 --- a/server/reds.c +++ b/server/reds.c @@ -294,7 +294,7 @@ typedef struct RedsState { } RedsState; uint64_t bitrate_per_sec = ~0; -static uint64_t letancy = 0; +static uint64_t latency = 0; static RedsState *reds = NULL; @@ -750,7 +750,7 @@ static void reds_disconnect() reds->in_handler.end_pos = 0; bitrate_per_sec = ~0; - letancy = 0; + latency = 0; reds_mig_cleanup(); reds->disconnecting = FALSE; @@ -1721,20 +1721,20 @@ static void reds_main_handle_message(void *opaque, size_t size, uint32_t type, v case NET_TEST_STAGE_LATENCY: reds->net_test_id++; reds->net_test_stage = NET_TEST_STAGE_RATE; - letancy = roundtrip; + latency = roundtrip; break; case NET_TEST_STAGE_RATE: reds->net_test_id = 0; - if (roundtrip <= letancy) { + if (roundtrip <= latency) { // probably high load on client or server result with incorrect values - letancy = 0; - red_printf("net test: invalid values, letancy %lu roundtrip %lu. assuming high" - "bandwidth", letancy, roundtrip); + latency = 0; + red_printf("net test: invalid values, latency %lu roundtrip %lu. assuming high" + "bandwidth", latency, roundtrip); break; } - bitrate_per_sec = (uint64_t)(NET_TEST_BYTES * 8) * 1000000 / (roundtrip - letancy); - red_printf("net test: letancy %f ms, bitrate %lu bps (%f Mbps)%s", - (double)letancy / 1000, + bitrate_per_sec = (uint64_t)(NET_TEST_BYTES * 8) * 1000000 / (roundtrip - latency); + red_printf("net test: latency %f ms, bitrate %lu bps (%f Mbps)%s", + (double)latency / 1000, bitrate_per_sec, (double)bitrate_per_sec / 1024 / 1024, IS_LOW_BANDWIDTH() ? " LOW BANDWIDTH" : ""); |