The only difference between them being that the later also does a push. I don't believe that to be a problem, but if it does I can always introduce a push'less version. --- server/red_client_cache.h | 2 +- server/red_worker.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/server/red_client_cache.h b/server/red_client_cache.h index a79944a..fae4b2a 100644 --- a/server/red_client_cache.h +++ b/server/red_client_cache.h @@ -74,7 +74,7 @@ static void FUNC_NAME(remove)(CHANNEL *channel, CacheItem *item) channel->VAR_NAME(available) += item->size; red_channel_pipe_item_init(&channel->common.base, &item->u.pipe_data, PIPE_ITEM_TYPE_INVAL_ONE); - red_pipe_add_tail(&channel->common.base, &item->u.pipe_data); // for now + red_channel_pipe_add_tail(&channel->common.base, &item->u.pipe_data); // for now } static int FUNC_NAME(add)(CHANNEL *channel, uint64_t id, size_t size) diff --git a/server/red_worker.c b/server/red_worker.c index 3163ea6..8e3b106 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -1132,13 +1132,6 @@ static inline void pipe_item_remove(PipeItem *item) ring_remove(&item->link); } -static inline void red_pipe_add_tail(RedChannel *channel, PipeItem *item) -{ - ASSERT(channel); - channel->pipe_size++; - ring_add_before(&item->link, &channel->pipe); -} - static void red_pipe_add_verb(RedChannel* channel, uint16_t verb) { VerbItem *item = spice_new(VerbItem, 1); @@ -1195,7 +1188,7 @@ static inline void red_pipe_add_drawable_to_tail(RedWorker *worker, Drawable *dr return; } drawable->refs++; - red_pipe_add_tail(&worker->display_channel->common.base, &drawable->pipe_item); + red_channel_pipe_add_tail(&worker->display_channel->common.base, &drawable->pipe_item); } static inline void red_pipe_add_drawable_after(RedWorker *worker, Drawable *drawable, -- 1.7.4.1 _______________________________________________ Spice-devel mailing list Spice-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/spice-devel