sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lock on area tracking

Browse Source
This commit is contained in:
John Cupitt 2013-08-06 11:43:41 +01:00
parent 8e85c3d0df
commit 1ef32179da
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libvips/iofuncs/type.c
View File

@ -37,9 +37,9 @@
*/ */
/* /*
*/
#define VIPS_DEBUG #define VIPS_DEBUG
#define DEBUG #define DEBUG
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -150,7 +150,7 @@ vips_area_copy( VipsArea *area )
{ {
g_mutex_lock( area->lock ); g_mutex_lock( area->lock );
g_assert( area->count >= 0 ); g_assert( area->count > 0 );
area->count += 1; area->count += 1;
@ -192,12 +192,17 @@ vips_area_unref( VipsArea *area )
g_free( area ); g_free( area );
if( vips__leak ) if( vips__leak ) {
g_mutex_lock( vips__global_lock );
vips_area_all = g_slist_remove( vips_area_all, area ); vips_area_all = g_slist_remove( vips_area_all, area );
g_mutex_unlock( vips__global_lock );
}
#ifdef DEBUG #ifdef DEBUG
g_mutex_lock( vips__global_lock );
printf( "vips_area_unref: free .. total = %d\n", printf( "vips_area_unref: free .. total = %d\n",
g_slist_length( vips_area_all ) ); g_slist_length( vips_area_all ) );
g_mutex_unlock( vips__global_lock );
#endif /*DEBUG*/ #endif /*DEBUG*/
} }
else else
@ -230,13 +235,18 @@ vips_area_new( VipsCallbackFn free_fn, void *data )
area->type = 0; area->type = 0;
area->sizeof_type = 0; area->sizeof_type = 0;
if( vips__leak ) if( vips__leak ) {
g_mutex_lock( vips__global_lock );
vips_area_all = g_slist_prepend( vips_area_all, area ); vips_area_all = g_slist_prepend( vips_area_all, area );
g_mutex_unlock( vips__global_lock );
}
#ifdef DEBUG #ifdef DEBUG
g_mutex_lock( vips__global_lock );
printf( "vips_area_new: %p count = %d (%d in total)\n", printf( "vips_area_new: %p count = %d (%d in total)\n",
area, area->count, area, area->count,
g_slist_length( vips_area_all ) ); g_slist_length( vips_area_all ) );
g_mutex_unlock( vips__global_lock );
#endif /*DEBUG*/ #endif /*DEBUG*/
return( area ); return( area );