From 54f19a00e5121521086858d0da8c2b9e0b49fc21 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 28 Jan 2014 14:51:30 +0000
Subject: [PATCH] update valgrind supp

---
 TODO         | 37 ++++++++++++++++++++++++
 libvips.supp | 80 +++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 113 insertions(+), 4 deletions(-)

diff --git a/TODO b/TODO
index 2b7fb047..f4411419 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,40 @@
+- leak ... nip2 ~/pics/babe.jpg, ^Q 
+
+==4389== 784 bytes in 1 blocks are possibly lost in loss record 14,881 of
+15,393
+==4389==    at 0x4C2A2DB: malloc (in
+/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+==4389==    by 0x6749221: vips_tracked_malloc (memory.c:289)
+==4389==    by 0x67587E9: buffer_move (buffer.c:368)
+==4389==    by 0x675898B: vips_buffer_new (buffer.c:412)
+==4389==    by 0x6758C11: vips_buffer_unref_ref (buffer.c:519)
+==4389==    by 0x674F5FB: vips_region_buffer (region.c:602)
+==4389==    by 0x674FF73: vips_region_fill (region.c:887)
+==4389==    by 0x67505AD: vips_region_prepare (region.c:1139)
+==4389==    by 0x67400FB: vips_image_write_gen (image.c:1930)
+==4389==    by 0x67504CF: vips_region_generate (region.c:1074)
+==4389==    by 0x6750718: vips_region_prepare_to_generate (region.c:1196)
+==4389==    by 0x6750A55: vips_region_prepare_to (region.c:1315)
+
+==4389== 784 bytes in 1 blocks are possibly lost in loss record 14,882 of
+15,393
+==4389==    at 0x4C2A2DB: malloc (in
+/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+==4389==    by 0x6749221: vips_tracked_malloc (memory.c:289)
+==4389==    by 0x67587E9: buffer_move (buffer.c:368)
+==4389==    by 0x6758BC6: vips_buffer_unref_ref (buffer.c:508)
+==4389==    by 0x674F5FB: vips_region_buffer (region.c:602)
+==4389==    by 0x674FF73: vips_region_fill (region.c:887)
+==4389==    by 0x67505AD: vips_region_prepare (region.c:1139)
+==4389==    by 0x67400FB: vips_image_write_gen (image.c:1930)
+==4389==    by 0x67504CF: vips_region_generate (region.c:1074)
+==4389==    by 0x6750718: vips_region_prepare_to_generate (region.c:1196)
+==4389==    by 0x6750A55: vips_region_prepare_to (region.c:1315)
+==4389==    by 0x6747EC1: render_work (sinkscreen.c:418)
+
+
+
+
 - vips_colourspace() needs an option from_space param,?
 
 - check_uncoded() left to do:
diff --git a/libvips.supp b/libvips.supp
index ef277189..c3b3e74c 100644
--- a/libvips.supp
+++ b/libvips.supp
@@ -45,7 +45,7 @@
    init7
    Memcheck:Leak
    ...
-   fun:g_malloc0
+   fun:*alloc*
    ...
    fun:_dl_init
 }
@@ -85,13 +85,29 @@
    fun:XInitExtension
 }
 
+{
+   gio
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:g_simple_async_result_complete
+}
+
+{
+   pthread
+   Memcheck:Leak
+   fun:calloc
+   fun:_dl_allocate_tls
+   fun:pthread_create@@GLIBC_*
+}
+
 # hide all dbus reports, not the app's problem
 {
    dbus
    Memcheck:Leak
    fun:*alloc
    ...
-   obj:/lib/libdbus-1.so.*
+   obj:*/libdbus-1.so.*
 }
 
 # hide all orbit leaks, not our problem
@@ -112,6 +128,31 @@
    fun:FcConfigParseAndLoad
 }
 
+{
+   fontconfig2
+   Memcheck:Leak
+   fun:malloc
+   fun:strdup
+   fun:FcValueSave
+   obj:*/libfontconfig.so.*
+}
+
+{
+   fontconfig3
+   Memcheck:Leak
+   fun:realloc
+   ...
+   fun:FcFontMatch
+}
+
+{
+   fontconfig4
+   Memcheck:Leak
+   fun:realloc
+   ...
+   fun:FcPatternAddInteger
+}
+
 {
    freetype_init
    Memcheck:Leak
@@ -120,6 +161,14 @@
    fun:FT_Open_Face
 }
 
+{
+   harfbuzz
+   Memcheck:Leak
+   fun:calloc
+   ...
+   fun:hb_shape_plan_execute
+}
+
 {
    goffice_init
    Memcheck:Leak
@@ -257,8 +306,6 @@
    fun:write_vips
 }
 
-# ubuntu 13.04 suppressions
-
 {
    pixman1
    Memcheck:Cond
@@ -272,6 +319,30 @@
    fun:rsvg_cairo_surface_to_pixbuf
 }
 
+{
+   rsvg
+   Memcheck:Cond
+   obj:*/librsvg-2.so.*
+}
+
+{
+   murrine
+   Memcheck:Leak
+   fun:calloc
+   fun:g_malloc0
+   fun:raico_blur_create
+}
+
+{
+   signal_connect
+   Memcheck:Leak
+   fun:calloc
+   fun:g_malloc0
+   fun:g_closure_new_simple
+   fun:g_cclosure_new
+   fun:g_signal_connect_data
+}
+
 # ruby has some annoying ones too
 
 {
@@ -304,3 +375,4 @@
 
 
 
+