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

have out own lock foe dzsave

Browse Source 
we were calling quite a few funcs from inside the global lock, some of
which used the global lock themselves

have our own file operation lock, it's neater
This commit is contained in:
John Cupitt 2013-02-13 15:19:17 +00:00
parent 4268f27d5b
commit 174c2fa8c1
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libvips/foreign/dzsave.c
View File

@ -632,6 +632,11 @@ strip_allocate( VipsThreadState *state, void *a, gboolean *stop )
static int static int
tile_name( Layer *layer, char *buf, int x, int y ) tile_name( Layer *layer, char *buf, int x, int y )
{ {
/* Need to lock around some file operations.
*/
static GMutex *file_lock = NULL;
static GOnce file_lock_once = G_ONCE_INIT;
VipsForeignSaveDz *dz = layer->dz; VipsForeignSaveDz *dz = layer->dz;
char dirname[PATH_MAX]; char dirname[PATH_MAX];
@ -641,7 +646,9 @@ tile_name( Layer *layer, char *buf, int x, int y )
/* We have to lock or there's a race between exists() and mkdir(). /* We have to lock or there's a race between exists() and mkdir().
*/ */
g_mutex_lock( vips__global_lock ); file_lock = g_once( &file_lock_once,
(GThreadFunc) vips_g_mutex_new, NULL );
g_mutex_lock( file_lock );
switch( dz->layout ) { switch( dz->layout ) {
case VIPS_FOREIGN_DZ_LAYOUT_DZ: case VIPS_FOREIGN_DZ_LAYOUT_DZ:
@ -652,7 +659,7 @@ tile_name( Layer *layer, char *buf, int x, int y )
if( !vips_existsf( "%s", dirname ) && if( !vips_existsf( "%s", dirname ) &&
vips_mkdirf( "%s", dirname ) ) { vips_mkdirf( "%s", dirname ) ) {
g_mutex_unlock( vips__global_lock ); g_mutex_unlock( file_lock );
return( -1 ); return( -1 );
} }
@ -686,7 +693,7 @@ tile_name( Layer *layer, char *buf, int x, int y )
if( !vips_existsf( "%s", dirname ) && if( !vips_existsf( "%s", dirname ) &&
vips_mkdirf( "%s", dirname ) ) { vips_mkdirf( "%s", dirname ) ) {
g_mutex_unlock( vips__global_lock ); g_mutex_unlock( file_lock );
return( -1 ); return( -1 );
} }
@ -702,13 +709,13 @@ tile_name( Layer *layer, char *buf, int x, int y )
if( !vips_existsf( "%s", dirname ) && if( !vips_existsf( "%s", dirname ) &&
vips_mkdirf( "%s", dirname ) ) { vips_mkdirf( "%s", dirname ) ) {
g_mutex_unlock( vips__global_lock ); g_mutex_unlock( file_lock );
return( -1 ); return( -1 );
} }
if( !vips_existsf( "%s", dirname2 ) && if( !vips_existsf( "%s", dirname2 ) &&
vips_mkdirf( "%s", dirname2 ) ) { vips_mkdirf( "%s", dirname2 ) ) {
g_mutex_unlock( vips__global_lock ); g_mutex_unlock( file_lock );
return( -1 ); return( -1 );
} }
@ -716,11 +723,11 @@ tile_name( Layer *layer, char *buf, int x, int y )
default: default:
g_assert( 0 ); g_assert( 0 );
g_mutex_unlock( vips__global_lock ); g_mutex_unlock( file_lock );
return( -1 ); return( -1 );
} }
g_mutex_unlock( vips__global_lock ); g_mutex_unlock( file_lock );
return( 0 ); return( 0 );
} }