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

remove single-thread-first-tile thing

Browse Source 
new seq system makes it unnecessary
This commit is contained in:
John Cupitt 2017-03-06 13:15:25 +00:00
parent 362c7efdfc
commit 755fa74c30
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
TODO
View File

@ -1,10 +1,3 @@
- check initial cache sizing in vips_line_cache_build
what about dynamic cache sizing?
- vips_object_class_install_argument() should check for duplicate priorities, - vips_object_class_install_argument() should check for duplicate priorities,
it's been behind a few nasty bugs it's been behind a few nasty bugs

18
libvips/iofuncs/threadpool.c
View File

@ -15,6 +15,9 @@
* errors (thanks Tim) * errors (thanks Tim)
* 25/7/14 * 25/7/14
* - limit nthr on tiny images * - limit nthr on tiny images
* 6/3/17
* - remove single-thread-first-request thing, new seq system makes it
* unnecessary
*/ */
/* /*
@ -548,12 +551,6 @@ typedef struct _VipsThreadpool {
/* Set by Allocate (via an arg) to indicate normal end of computation. /* Set by Allocate (via an arg) to indicate normal end of computation.
*/ */
gboolean stop; gboolean stop;
/* Set by the first thread to hit allocate. The first work unit runs
* single-threaded to give loaders a change to get to the right spot
* in the input.
*/
gboolean done_first;
} VipsThreadpool; } VipsThreadpool;
/* Junk a thread. /* Junk a thread.
@ -635,8 +632,7 @@ vips_thread_work_unit( VipsThread *thr )
return; return;
} }
if( pool->done_first ) g_mutex_unlock( pool->allocate_lock );
g_mutex_unlock( pool->allocate_lock );
/* Process a work unit. /* Process a work unit.
*/ */
@ -644,11 +640,6 @@ vips_thread_work_unit( VipsThread *thr )
thr->error = TRUE; thr->error = TRUE;
pool->error = TRUE; pool->error = TRUE;
} }
if( !pool->done_first ) {
pool->done_first = TRUE;
g_mutex_unlock( pool->allocate_lock );
}
} }
/* What runs as a thread ... loop, waiting to be told to do stuff. /* What runs as a thread ... loop, waiting to be told to do stuff.
@ -781,7 +772,6 @@ vips_threadpool_new( VipsImage *im )
vips_semaphore_init( &pool->tick, 0, "tick" ); vips_semaphore_init( &pool->tick, 0, "tick" );
pool->error = FALSE; pool->error = FALSE;
pool->stop = FALSE; pool->stop = FALSE;
pool->done_first = FALSE;
/* If this is a tiny image, we won't need all nthr threads. Guess how /* If this is a tiny image, we won't need all nthr threads. Guess how
* many tiles we might need to cover the image and use that to limit * many tiles we might need to cover the image and use that to limit