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

Merge pull request #1293 from abdollar/fix_stack_size 

fixes set_stacksize which broke during merge
This commit is contained in:
John Cupitt 2019-04-22 17:29:19 +01:00 committed by GitHub
parent 27aae32ff6 c6b9015799
commit 90e1b1cc49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libvips/iofuncs/init.c
View File

@ -293,12 +293,16 @@ set_stacksize( void )
vips_min_stack_size = VIPS_MAX( default_min_stack_size,
vips__parse_size( pstacksize_str ) );
if( cur_stack_size < vips_min_stack_size ||
pthread_attr_setstacksize( &attr, vips_min_stack_size ) ||
pthread_setattr_default_np( &attr ) )
g_warning( _( "could not set minimum pthread stack "
"size of %s, current size is %dk" ),
pstacksize_str, (int) (cur_stack_size / 1024.0) );
if( cur_stack_size < vips_min_stack_size) {
if (pthread_attr_setstacksize( &attr, vips_min_stack_size ) ||
pthread_setattr_default_np( &attr ) ) {
g_warning( _( "could not set minimum pthread stack "
"size of %s, current size is %dk" ),
pstacksize_str, (int) (cur_stack_size / 1024.0) );
}
}
pthread_attr_getstacksize( &attr, &cur_stack_size );
g_info("current stack size is set to %lu", cur_stack_size);
#endif /*HAVE_PTHREAD_DEFAULT_NP*/
}