[Spice-devel] [PATCH 06/23] server/red_worker: s/red_receive/red_channel_receive/

[Marc-André Lureau]

ack

On Fri, Feb 11, 2011 at 6:22 PM, Alon Levy <alevy at redhat.com> wrote:
> ---
>  server/red_worker.c |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/server/red_worker.c b/server/red_worker.c
> index 34025b1..05c537e 100644
> --- a/server/red_worker.c
> +++ b/server/red_worker.c
> @@ -985,7 +985,7 @@ 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_channel_begin_send_message(RedChannel *channel);
>  static inline void display_begin_send_message(DisplayChannel *channel);
> -static void red_receive(RedChannel *channel);
> +static void red_channel_receive(RedChannel *channel);
>  static void red_release_pixmap_cache(DisplayChannel *channel);
>  static void red_release_glz(DisplayChannel *channel);
>  static void red_freeze_glz(DisplayChannel *channel);
> @@ -8825,7 +8825,7 @@ static inline void flush_display_commands(RedWorker *worker)
>             }
>             RedChannel *channel = (RedChannel *)worker->display_channel;
>             red_ref_channel(channel);
> -            red_receive(channel);
> +            red_channel_receive(channel);
>             red_channel_send(channel);
>             if (red_now() >= end_time) {
>                 red_printf("update timeout");
> @@ -8867,7 +8867,7 @@ static inline void flush_cursor_commands(RedWorker *worker)
>             }
>             RedChannel *channel = (RedChannel *)worker->cursor_channel;
>             red_ref_channel(channel);
> -            red_receive(channel);
> +            red_channel_receive(channel);
>             red_channel_send(channel);
>             if (red_now() >= end_time) {
>                 red_printf("flush cursor timeout");
> @@ -8905,7 +8905,7 @@ static int display_channel_wait_for_init(DisplayChannel *display_channel)
>     display_channel->expect_init = TRUE;
>     uint64_t end_time = red_now() + DISPLAY_CLIENT_TIMEOUT;
>     for (;;) {
> -        red_receive((RedChannel *)display_channel);
> +        red_channel_receive((RedChannel *)display_channel);
>         if (!display_channel->common.base.peer) {
>             break;
>         }
> @@ -9282,7 +9282,7 @@ static int display_channel_handle_message(RedChannel *channel, uint32_t size, ui
>     }
>  }
>
> -static void red_receive(RedChannel *channel)
> +static void red_channel_receive(RedChannel *channel)
>  {
>     for (;;) {
>         ssize_t n;
> @@ -9443,7 +9443,7 @@ static void handle_channel_events(EventListener *in_listener, uint32_t events)
>     RedChannel *channel = &common->base;
>
>     if ((events & EPOLLIN)) {
> -        red_receive(channel);
> +        red_channel_receive(channel);
>     }
>
>     if (channel->send_data.blocked) {
> @@ -9721,7 +9721,7 @@ static void red_wait_outgoing_item(RedChannel *channel)
>
>     do {
>         usleep(DETACH_SLEEP_DURATION);
> -        red_receive(channel);
> +        red_channel_receive(channel);
>         red_channel_send(channel);
>     } while ((blocked = channel->send_data.blocked) && red_now() < end_time);
>
> @@ -9750,7 +9750,7 @@ static void red_wait_pipe_item_sent(RedChannel *channel, PipeItem *item)
>     end_time = red_now() + CHANNEL_PUSH_TIMEOUT;
>
>     if (channel->send_data.blocked) {
> -        red_receive(channel);
> +        red_channel_receive(channel);
>         red_channel_send(channel);
>     }
>     // todo: different push for each channel
> @@ -9758,7 +9758,7 @@ static void red_wait_pipe_item_sent(RedChannel *channel, PipeItem *item)
>
>     while((item_in_pipe = ring_item_is_linked(&item->link)) && (red_now() < end_time)) {
>         usleep(CHANNEL_PUSH_SLEEP_DURATION);
> -        red_receive(channel);
> +        red_channel_receive(channel);
>         red_channel_send(channel);
>         red_push(common->worker);
>     }
> --
> 1.7.4
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>



-- 
Marc-André Lureau