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

better cache sizing in unbuffered sequential mode

Browse Source 
Previously we only ever had a single tile of cache in unbuffered mode.
This could break with many threads, if thread requests crossed tile
boundaries.

Now have one tile per thread, plus a bit for slop.
This commit is contained in:
John Cupitt 2013-11-20 14:46:46 +00:00
parent 4065ec925c
commit 88b2f4350d
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
20/11/13 started 7.36.5
- better cache sizing in unbuffered sequential mode
15/11/13 started 7.36.4 15/11/13 started 7.36.4
- improve compat with im_init_world() - improve compat with im_init_world()

6
configure.ac
View File

@ -2,7 +2,7 @@
# also update the version number in the m4 macros below # also update the version number in the m4 macros below
AC_INIT([vips], [7.36.4], [vipsip@jiscmail.ac.uk]) AC_INIT([vips], [7.36.5], [vipsip@jiscmail.ac.uk])
# required for gobject-introspection # required for gobject-introspection
AC_PREREQ(2.62) AC_PREREQ(2.62)
@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4])
# user-visible library versioning # user-visible library versioning
m4_define([vips_major_version], [7]) m4_define([vips_major_version], [7])
m4_define([vips_minor_version], [36]) m4_define([vips_minor_version], [36])
m4_define([vips_micro_version], [4]) m4_define([vips_micro_version], [5])
m4_define([vips_version], m4_define([vips_version],
[vips_major_version.vips_minor_version.vips_micro_version]) [vips_major_version.vips_minor_version.vips_micro_version])
@ -37,7 +37,7 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date`
# binary interface changes not backwards compatible?: reset age to 0 # binary interface changes not backwards compatible?: reset age to 0
LIBRARY_CURRENT=35 LIBRARY_CURRENT=35
LIBRARY_REVISION=4 LIBRARY_REVISION=5
LIBRARY_AGE=0 LIBRARY_AGE=0
# patched into include/vips/version.h # patched into include/vips/version.h

17
libvips/conversion/sequential.c
View File

@ -46,6 +46,7 @@
*/ */
/* /*
#define VIPS_DEBUG_GREEN
#define VIPS_DEBUG #define VIPS_DEBUG
*/ */
@ -120,7 +121,7 @@ vips_sequential_generate( VipsRegion *or,
VipsRect *r = &or->valid; VipsRect *r = &or->valid;
VipsRegion *ir = (VipsRegion *) seq; VipsRegion *ir = (VipsRegion *) seq;
VIPS_DEBUG_MSG( "thread %p request for line %d, height %d\n", VIPS_DEBUG_MSG_GREEN( "thread %p request for line %d, height %d\n",
g_thread_self(), r->top, r->height ); g_thread_self(), r->top, r->height );
if( sequential->trace ) if( sequential->trace )
@ -130,7 +131,7 @@ vips_sequential_generate( VipsRegion *or,
g_mutex_lock( sequential->lock ); g_mutex_lock( sequential->lock );
VIPS_DEBUG_MSG( "thread %p has lock ...\n", g_thread_self() ); VIPS_DEBUG_MSG_GREEN( "thread %p has lock ...\n", g_thread_self() );
/* If we've seen an error, everything must stop. /* If we've seen an error, everything must stop.
*/ */
@ -163,7 +164,7 @@ vips_sequential_generate( VipsRegion *or,
g_time_val_add( &time, STALL_TIME * 1000000 ); g_time_val_add( &time, STALL_TIME * 1000000 );
#endif #endif
VIPS_DEBUG_MSG( "thread %p stalling for up to %gs ...\n", VIPS_DEBUG_MSG_GREEN( "thread %p stalling for up to %gs ...\n",
g_thread_self(), STALL_TIME ); g_thread_self(), STALL_TIME );
/* Exit the loop on timeout or condition passes. We have to /* Exit the loop on timeout or condition passes. We have to
@ -180,7 +181,7 @@ vips_sequential_generate( VipsRegion *or,
break; break;
#endif #endif
VIPS_DEBUG_MSG( "thread %p awake again ...\n", VIPS_DEBUG_MSG_GREEN( "thread %p awake again ...\n",
g_thread_self() ); g_thread_self() );
} }
@ -194,7 +195,7 @@ vips_sequential_generate( VipsRegion *or,
*/ */
VipsRect area; VipsRect area;
VIPS_DEBUG_MSG( "thread %p skipping to line %d ...\n", VIPS_DEBUG_MSG_GREEN( "thread %p skipping to line %d ...\n",
g_thread_self(), g_thread_self(),
r->top ); r->top );
@ -217,7 +218,7 @@ vips_sequential_generate( VipsRegion *or,
/* This is a request for old or present pixels -- serve from cache. /* This is a request for old or present pixels -- serve from cache.
* This may trigger further, sequential reads. * This may trigger further, sequential reads.
*/ */
VIPS_DEBUG_MSG( "thread %p reading ...\n", g_thread_self() ); VIPS_DEBUG_MSG_GREEN( "thread %p reading ...\n", g_thread_self() );
if( vips_region_prepare( ir, r ) || if( vips_region_prepare( ir, r ) ||
vips_region_region( or, ir, r, r->left, r->top ) ) { vips_region_region( or, ir, r, r->left, r->top ) ) {
VIPS_DEBUG_MSG( "thread %p error, unlocking ...\n", VIPS_DEBUG_MSG( "thread %p error, unlocking ...\n",
@ -234,7 +235,7 @@ vips_sequential_generate( VipsRegion *or,
*/ */
sequential->y_pos = VIPS_RECT_BOTTOM( r ); sequential->y_pos = VIPS_RECT_BOTTOM( r );
VIPS_DEBUG_MSG( "thread %p updating y_pos to %d and " VIPS_DEBUG_MSG_GREEN( "thread %p updating y_pos to %d and "
"waking stalled\n", "waking stalled\n",
g_thread_self(), g_thread_self(),
sequential->y_pos ); sequential->y_pos );
@ -242,7 +243,7 @@ vips_sequential_generate( VipsRegion *or,
g_cond_broadcast( sequential->ready ); g_cond_broadcast( sequential->ready );
} }
VIPS_DEBUG_MSG( "thread %p unlocking ...\n", g_thread_self() ); VIPS_DEBUG_MSG_GREEN( "thread %p unlocking ...\n", g_thread_self() );
g_mutex_unlock( sequential->lock ); g_mutex_unlock( sequential->lock );

7
libvips/conversion/tilecache.c
View File

@ -899,7 +899,12 @@ vips_line_cache_build( VipsObject *object )
block_cache->access = cache->access; block_cache->access = cache->access;
if( cache->access == VIPS_ACCESS_SEQUENTIAL_UNBUFFERED ) if( cache->access == VIPS_ACCESS_SEQUENTIAL_UNBUFFERED )
block_cache->max_tiles = 1; /* A tile per thread.
*
* Imagine scanline tiles and four threads. And add a bit for
* slop.
*/
block_cache->max_tiles = 2 * vips_concurrency_get();
else { else {
/* Enough lines for two complete buffers would be exactly /* Enough lines for two complete buffers would be exactly
* right. Make it 3 to give us some slop room. * right. Make it 3 to give us some slop room.