On Wed, Dec 2, 2015 at 5:19 PM, Frediano Ziglio <fziglio@xxxxxxxxxx> wrote:
> From: Marc-André Lureau <marcandre.lureau@xxxxxxxxx>
>
> ---
> server/red_worker.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/server/red_worker.c b/server/red_worker.c
> index cc2e2ab..9ba57e4 100644
> --- a/server/red_worker.c
> +++ b/server/red_worker.c
> @@ -87,7 +87,7 @@ struct RedWorker {
> spice_wan_compression_t jpeg_state;
> spice_wan_compression_t zlib_glz_state;
>
> - uint32_t process_commands_generation;
> + uint32_t process_display_generation;
> #ifdef RED_STATISTICS
> StatNodeRef stat;
> uint64_t *wakeup_counter;
> @@ -224,7 +224,7 @@ static RedDrawable *red_drawable_new(RedWorker *worker)
> return red;
> }
>
> -static int red_process_commands(RedWorker *worker, uint32_t max_pipe_size, int *ring_is_empty)
> +static int red_process_display(RedWorker *worker, uint32_t max_pipe_size, int *ring_is_empty)
> {
> QXLCommandExt ext_cmd;
> int n = 0;
> @@ -235,7 +235,7 @@ static int red_process_commands(RedWorker *worker, uint32_t max_pipe_size, int *
> return n;
> }
>
> - worker->process_commands_generation++;
> + worker->process_display_generation++;
> *ring_is_empty = FALSE;
> while (!display_is_connected(worker) ||
> // TODO: change to average pipe size?
> @@ -268,7 +268,7 @@ static int red_process_commands(RedWorker *worker, uint32_t max_pipe_size, int *
> if (!red_get_drawable(&worker->mem_slots, ext_cmd.group_id,
> red_drawable, ext_cmd.cmd.data, ext_cmd.flags)) {
> display_channel_process_draw(worker->display_channel, red_drawable, ext_cmd.group_id,
> - worker->process_commands_generation);
> + worker->process_display_generation);
> }
> // release the red_drawable
> red_drawable_unref(worker, red_drawable, ext_cmd.group_id);
> @@ -386,12 +386,12 @@ static void flush_display_commands(RedWorker *worker)
> uint64_t end_time;
> int ring_is_empty;
>
> - red_process_commands(worker, MAX_PIPE_SIZE, &ring_is_empty);
> + red_process_display(worker, MAX_PIPE_SIZE, &ring_is_empty);
> if (ring_is_empty) {
> break;
> }
>
> - while (red_process_commands(worker, MAX_PIPE_SIZE, &ring_is_empty)) {
> + while (red_process_display(worker, MAX_PIPE_SIZE, &ring_is_empty)) {
> red_channel_push(RED_CHANNEL(worker->display_channel));
> }
>
> @@ -1004,7 +1004,7 @@ static void handle_dev_oom(void *opaque, void *payload)
> display->glz_drawable_count,
> display->current_size,
> red_channel_sum_pipes_size(display_red_channel));
> - while (red_process_commands(worker, MAX_PIPE_SIZE, &ring_is_empty)) {
> + while (red_process_display(worker, MAX_PIPE_SIZE, &ring_is_empty)) {
> red_channel_push(display_red_channel);
> }
> if (worker->qxl->st->qif->flush_resources(worker->qxl) == 0) {
> @@ -1681,7 +1681,7 @@ SPICE_GNUC_NORETURN static void *red_worker_main(void *arg)
> if (worker->running) {
> int ring_is_empty;
> red_process_cursor(worker, MAX_PIPE_SIZE, &ring_is_empty);
> - red_process_commands(worker, MAX_PIPE_SIZE, &ring_is_empty);
> + red_process_display(worker, MAX_PIPE_SIZE, &ring_is_empty);
> }
> red_push(worker);
> }
> --
> 2.4.3
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
Acked-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel