[Spice-commits] 2 commits - server/image-encoders.c server/image-encoders.h

[Frediano Ziglio]

 server/image-encoders.c |    3 +++
 server/image-encoders.h |    1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 67981ff7f61c5168b999ee89287b61967c8d8291
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri Jun 17 12:16:10 2016 +0100

    Make RedGlzDrawable typedef private
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/server/image-encoders.c b/server/image-encoders.c
index 43cabfe..5759230 100644
--- a/server/image-encoders.c
+++ b/server/image-encoders.c
@@ -32,6 +32,7 @@
 
 #define MAX_GLZ_DRAWABLE_INSTANCES 2
 
+typedef struct RedGlzDrawable RedGlzDrawable;
 typedef struct GlzDrawableInstanceItem GlzDrawableInstanceItem;
 
 struct GlzSharedDictionary {
diff --git a/server/image-encoders.h b/server/image-encoders.h
index 1ca6b87..e07c036 100644
--- a/server/image-encoders.h
+++ b/server/image-encoders.h
@@ -34,7 +34,6 @@
 struct RedClient;
 
 typedef struct RedCompressBuf RedCompressBuf;
-typedef struct RedGlzDrawable RedGlzDrawable;
 typedef struct ImageEncoders ImageEncoders;
 typedef struct ImageEncoderSharedData ImageEncoderSharedData;
 typedef struct GlzSharedDictionary GlzSharedDictionary;
commit 0434e66a374b7c3adfbf5d804accd6ea28956233
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri Jun 17 12:03:30 2016 +0100

    Destroy pthread structures
    
    Current Linux pthread implementation should use futex so there should
    be no leak but calling destroy avoid possible future leaks.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/server/image-encoders.c b/server/image-encoders.c
index b47ae35..43cabfe 100644
--- a/server/image-encoders.c
+++ b/server/image-encoders.c
@@ -488,6 +488,7 @@ void image_encoders_free(ImageEncoders *enc)
 #endif
     zlib_encoder_destroy(enc->zlib);
     enc->zlib = NULL;
+    pthread_mutex_destroy(&enc->glz_drawables_inst_to_free_lock);
 }
 
 /* Remove from the to_free list and the instances_list.
@@ -820,6 +821,7 @@ static void image_encoders_release_glz(ImageEncoders *enc)
     ring_remove(&shared_dict->base);
     pthread_mutex_unlock(&glz_dictionary_list_lock);
     glz_enc_dictionary_destroy(shared_dict->dict, &enc->glz_data.usr);
+    pthread_rwlock_destroy(&shared_dict->encode_lock);
     free(shared_dict);
 }