summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-09-17 01:15:38 +0200
committerPavel Grunt <pgrunt@redhat.com>2015-11-13 15:42:58 +0100
commitc4e7ce29e9a5598ee0b59a0d2abc841c51ed6aeb (patch)
treeac5ca96ee1b32f86e89a6161d0a21dd411292a73 /server
parent801a8551145fedc90c226fbed0e4bae2baff2793 (diff)
worker: s/red_display/dcc
Diffstat (limited to 'server')
-rw-r--r--server/red_worker.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/server/red_worker.c b/server/red_worker.c
index 936bd8ac..d63bf24f 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -289,7 +289,7 @@ static void red_freeze_glz(DisplayChannelClient *dcc);
static void display_channel_push_release(DisplayChannelClient *dcc, uint8_t type, uint64_t id,
uint64_t* sync_data);
static int red_display_free_some_independent_glz_drawables(DisplayChannelClient *dcc);
-static void red_display_free_glz_drawable(DisplayChannelClient *dcc, RedGlzDrawable *drawable);
+static void dcc_free_glz_drawable(DisplayChannelClient *dcc, RedGlzDrawable *drawable);
static ImageItem *red_add_surface_area_image(DisplayChannelClient *dcc, int surface_id,
SpiceRect *area, PipeItem *pos, int can_lossy);
static void display_channel_client_release_item_before_push(DisplayChannelClient *dcc,
@@ -1482,7 +1482,7 @@ static bool free_one_drawable(DisplayChannel *display, int force_glz_free)
RingItem *glz_item, *next_item;
RedGlzDrawable *glz;
DRAWABLE_FOREACH_GLZ_SAFE(drawable, glz_item, next_item, glz) {
- red_display_free_glz_drawable(glz->dcc, glz);
+ dcc_free_glz_drawable(glz->dcc, glz);
}
}
red_draw_drawable(display, drawable);
@@ -2460,8 +2460,8 @@ static GlzDrawableInstanceItem *red_display_add_glz_drawable_instance(RedGlzDraw
it is not used by Drawable).
NOTE - 1) can be called only by the display channel that created the drawable
2) it is assumed that the instance was already removed from the dictionary*/
-static void red_display_free_glz_drawable_instance(DisplayChannelClient *dcc,
- GlzDrawableInstanceItem *glz_drawable_instance)
+static void dcc_free_glz_drawable_instance(DisplayChannelClient *dcc,
+ GlzDrawableInstanceItem *glz_drawable_instance)
{
DisplayChannel *display_channel = DCC_TO_DC(dcc);
RedWorker *worker = display_channel->common.worker;
@@ -2513,7 +2513,7 @@ static void red_display_handle_glz_drawables_to_free(DisplayChannelClient* dcc)
GlzDrawableInstanceItem *drawable_instance = SPICE_CONTAINEROF(ring_link,
GlzDrawableInstanceItem,
free_link);
- red_display_free_glz_drawable_instance(dcc, drawable_instance);
+ dcc_free_glz_drawable_instance(dcc, drawable_instance);
}
pthread_mutex_unlock(&dcc->glz_drawables_inst_to_free_lock);
}
@@ -2524,14 +2524,14 @@ static void red_display_handle_glz_drawables_to_free(DisplayChannelClient* dcc)
* if possible.
* NOTE - the caller should prevent encoding using the dictionary during this operation
*/
-static void red_display_free_glz_drawable(DisplayChannelClient *dcc, RedGlzDrawable *drawable)
+static void dcc_free_glz_drawable(DisplayChannelClient *dcc, RedGlzDrawable *drawable)
{
RingItem *head_instance = ring_get_head(&drawable->instances);
int cont = (head_instance != NULL);
while (cont) {
if (drawable->instances_count == 1) {
- /* Last instance: red_display_free_glz_drawable_instance will free the drawable */
+ /* Last instance: dcc_free_glz_drawable_instance will free the drawable */
cont = FALSE;
}
GlzDrawableInstanceItem *instance = SPICE_CONTAINEROF(head_instance,
@@ -2543,7 +2543,7 @@ static void red_display_free_glz_drawable(DisplayChannelClient *dcc, RedGlzDrawa
instance->glz_instance,
&dcc->glz_data.usr);
}
- red_display_free_glz_drawable_instance(dcc, instance);
+ dcc_free_glz_drawable_instance(dcc, instance);
if (cont) {
head_instance = ring_get_head(&drawable->instances);
@@ -2568,7 +2568,7 @@ static void red_display_client_clear_glz_drawables(DisplayChannelClient *dcc)
RedGlzDrawable *drawable = SPICE_CONTAINEROF(ring_link, RedGlzDrawable, link);
// no need to lock the to_free list, since we assured no other thread is encoding and
// thus not other thread access the to_free list of the channel
- red_display_free_glz_drawable(dcc, drawable);
+ dcc_free_glz_drawable(dcc, drawable);
}
pthread_rwlock_unlock(&glz_dict->encode_lock);
}
@@ -2604,7 +2604,7 @@ static int red_display_free_some_independent_glz_drawables(DisplayChannelClient
RedGlzDrawable *glz_drawable = SPICE_CONTAINEROF(ring_link, RedGlzDrawable, link);
ring_link = ring_next(&dcc->glz_drawables, ring_link);
if (!glz_drawable->drawable) {
- red_display_free_glz_drawable(dcc, glz_drawable);
+ dcc_free_glz_drawable(dcc, glz_drawable);
n++;
}
}