[Spice-devel] [PATCH 01/23] server/red_worker: s/red_send_data/red_channel_send/

[Marc-André Lureau]

ack

On Fri, Feb 11, 2011 at 6:22 PM, Alon Levy <alevy at redhat.com> wrote:
> ---
>  server/red_worker.c |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/server/red_worker.c b/server/red_worker.c
> index d75856e..1113b4b 100644
> --- a/server/red_worker.c
> +++ b/server/red_worker.c
> @@ -7336,7 +7336,7 @@ static void inline channel_release_res(RedChannel *channel)
>     channel->send_data.item = NULL;
>  }
>
> -static void red_send_data(RedChannel *channel)
> +static void red_channel_send(RedChannel *channel)
>  {
>     for (;;) {
>         uint32_t n = channel->send_data.size - channel->send_data.pos;
> @@ -7407,7 +7407,7 @@ static inline void red_channel_begin_send_message(RedChannel *channel)
>     channel->send_data.header->size =  channel->send_data.size - sizeof(SpiceDataHeader);
>     channel->ack_data.messages_window++;
>     channel->send_data.header = NULL; /* avoid writing to this until we have a new message */
> -    red_send_data(channel);
> +    red_channel_send(channel);
>  }
>
>  static inline void display_begin_send_message(DisplayChannel *channel)
> @@ -8816,7 +8816,7 @@ static inline void flush_display_commands(RedWorker *worker)
>             RedChannel *channel = (RedChannel *)worker->display_channel;
>             red_ref_channel(channel);
>             red_receive(channel);
> -            red_send_data(channel);
> +            red_channel_send(channel);
>             if (red_now() >= end_time) {
>                 red_printf("update timeout");
>                 red_disconnect_display(channel);
> @@ -8858,7 +8858,7 @@ static inline void flush_cursor_commands(RedWorker *worker)
>             RedChannel *channel = (RedChannel *)worker->cursor_channel;
>             red_ref_channel(channel);
>             red_receive(channel);
> -            red_send_data(channel);
> +            red_channel_send(channel);
>             if (red_now() >= end_time) {
>                 red_printf("flush cursor timeout");
>                 red_disconnect_cursor(channel);
> @@ -9435,7 +9435,7 @@ static void handle_channel_events(EventListener *in_listener, uint32_t events)
>     }
>
>     if (channel->send_data.blocked) {
> -        red_send_data(channel);
> +        red_channel_send(channel);
>     }
>  }
>
> @@ -9708,7 +9708,7 @@ static void red_wait_outgoing_item(RedChannel *channel)
>     do {
>         usleep(DETACH_SLEEP_DURATION);
>         red_receive(channel);
> -        red_send_data(channel);
> +        red_channel_send(channel);
>     } while ((blocked = channel->send_data.blocked) && red_now() < end_time);
>
>     if (blocked) {
> @@ -9737,7 +9737,7 @@ static void red_wait_pipe_item_sent(RedChannel *channel, PipeItem *item)
>
>     if (channel->send_data.blocked) {
>         red_receive(channel);
> -        red_send_data(channel);
> +        red_channel_send(channel);
>     }
>     // todo: different push for each channel
>     red_push(common->worker);
> @@ -9745,7 +9745,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_send_data(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