[Spice-commits] server/display-channel-private.h server/display-channel.c

[Frediano Ziglio]

 server/display-channel-private.h |    1 -
 server/display-channel.c         |    4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit e269e61f8b45182040635209881466708b3ae8c3
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Jan 26 18:17:25 2017 +0000

    display-channel: Remove current_size field
    
    This field is used only for debugging.
    Remove it reducing a bit all these "current" fields around.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/display-channel-private.h b/server/display-channel-private.h
index 38330da..a930cce 100644
--- a/server/display-channel-private.h
+++ b/server/display-channel-private.h
@@ -33,7 +33,6 @@ struct DisplayChannelPrivate
     int enable_zlib_glz_wrap;
 
     Ring current_list; // of TreeItem
-    uint32_t current_size;
 
     uint32_t drawable_count;
     _Drawable drawables[NUM_DRAWABLES];
diff --git a/server/display-channel.c b/server/display-channel.c
index 6069883..7d3c6e4 100644
--- a/server/display-channel.c
+++ b/server/display-channel.c
@@ -389,7 +389,6 @@ static void current_add_drawable(DisplayChannel *display,
     ring_add_after(&drawable->tree_item.base.siblings_link, pos);
     ring_add(&display->priv->current_list, &drawable->list_link);
     ring_add(&surface->current_list, &drawable->surface_list_link);
-    display->priv->current_size++;
     drawable->refs++;
 }
 
@@ -402,7 +401,6 @@ static void current_remove_drawable(DisplayChannel *display, Drawable *item)
     ring_remove(&item->list_link);
     ring_remove(&item->surface_list_link);
     drawable_unref(item);
-    display->priv->current_size--;
 }
 
 static void drawable_remove_from_pipes(Drawable *drawable)
@@ -2269,6 +2267,6 @@ void display_channel_debug_oom(DisplayChannel *display, const char *msg)
                 msg,
                 display->priv->drawable_count,
                 display->priv->encoder_shared_data.glz_drawable_count,
-                display->priv->current_size,
+                ring_get_length(&display->priv->current_list),
                 red_channel_sum_pipes_size(channel));
 }