diff options
| author | Alon Levy <alevy@redhat.com> | 2011-03-24 18:17:17 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-08-23 17:01:14 +0300 |
| commit | 75b6a305ff9c42a89c9db91277027d5dc6d103ef (patch) | |
| tree | 0146ac8ee12af43d10c92bf74fbc53e5e3b024c1 | |
| parent | 8fbc41b717fc18e7d73a48255b88b5a21e580d32 (diff) | |
| download | spice-75b6a305ff9c42a89c9db91277027d5dc6d103ef.tar.gz spice-75b6a305ff9c42a89c9db91277027d5dc6d103ef.tar.xz spice-75b6a305ff9c42a89c9db91277027d5dc6d103ef.zip | |
server/red_worker: drop red_pipe_add_tail, use red_channel_pipe_add_tail
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.
| -rw-r--r-- | server/red_client_cache.h | 2 | ||||
| -rw-r--r-- | 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 a79944ab..fae4b2ad 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 0e3e7aab..c0d03f39 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -1134,13 +1134,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); @@ -1198,7 +1191,7 @@ static inline void red_pipe_add_drawable_to_tail(RedWorker *worker, Drawable *dr } red_handle_drawable_surfaces_client_synced(worker, drawable); 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, |