0290eb009d
computation progress used to be done incrementally based on the number of tiles allocated. This did not take account of half tiles at image edges, so you could sometimes see "110% complete" it's now calculated based on the absolute number of pixels processed, so it should always report 100% at the end.
421 lines
9.5 KiB
C
421 lines
9.5 KiB
C
/* A sink that's not attached to anything, eg. find image average,
|
|
*
|
|
* 28/3/10
|
|
* - from im_iterate(), reworked for threadpool
|
|
*/
|
|
|
|
/*
|
|
|
|
This file is part of VIPS.
|
|
|
|
VIPS is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU Lesser General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
|
|
|
|
*/
|
|
|
|
/*
|
|
#define VIPS_DEBUG
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif /*HAVE_CONFIG_H*/
|
|
#include <vips/intl.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <vips/vips.h>
|
|
#include <vips/thread.h>
|
|
#include <vips/internal.h>
|
|
#include <vips/debug.h>
|
|
|
|
#include "sink.h"
|
|
|
|
/* Per-call state.
|
|
*/
|
|
typedef struct _Sink {
|
|
SinkBase sink_base;
|
|
|
|
/* We need a temp "p" image between the source image and us to
|
|
* make sure we can't damage the original.
|
|
*/
|
|
VipsImage *t;
|
|
|
|
/* Call params.
|
|
*/
|
|
VipsStartFn start_fn;
|
|
VipsGenerateFn generate_fn;
|
|
VipsStopFn stop_fn;
|
|
void *a;
|
|
void *b;
|
|
} Sink;
|
|
|
|
/* Our per-thread state.
|
|
*/
|
|
typedef struct _SinkThreadState {
|
|
VipsThreadState parent_object;
|
|
|
|
/* Sequence value for this thread.
|
|
*/
|
|
void *seq;
|
|
|
|
/* The region we walk over sink.t copy. We can't use
|
|
* parent_object.reg, it's defined on the outer image.
|
|
*/
|
|
VipsRegion *reg;
|
|
} SinkThreadState;
|
|
|
|
typedef struct _SinkThreadStateClass {
|
|
VipsThreadStateClass parent_class;
|
|
|
|
} SinkThreadStateClass;
|
|
|
|
G_DEFINE_TYPE( SinkThreadState, sink_thread_state, VIPS_TYPE_THREAD_STATE );
|
|
|
|
/* Call a thread's stop function.
|
|
*/
|
|
static int
|
|
sink_call_stop( Sink *sink, SinkThreadState *state )
|
|
{
|
|
if( state->seq && sink->stop_fn ) {
|
|
VIPS_DEBUG_MSG( "sink_call_stop: state = %p\n", state );
|
|
|
|
if( sink->stop_fn( state->seq, sink->a, sink->b ) ) {
|
|
SinkBase *sink_base = (SinkBase *) sink;
|
|
|
|
vips_error( "vips_sink",
|
|
_( "stop function failed for image \"%s\"" ),
|
|
sink_base->im->filename );
|
|
return( -1 );
|
|
}
|
|
|
|
state->seq = NULL;
|
|
}
|
|
|
|
return( 0 );
|
|
}
|
|
|
|
static void
|
|
sink_thread_state_dispose( GObject *gobject )
|
|
{
|
|
SinkThreadState *state = (SinkThreadState *) gobject;
|
|
Sink *sink = (Sink *) ((VipsThreadState *) state)->a;
|
|
|
|
sink_call_stop( sink, state );
|
|
VIPS_UNREF( state->reg );
|
|
|
|
G_OBJECT_CLASS( sink_thread_state_parent_class )->dispose( gobject );
|
|
}
|
|
|
|
/* Call the start function for this thread, if necessary.
|
|
*/
|
|
static int
|
|
sink_call_start( Sink *sink, SinkThreadState *state )
|
|
{
|
|
if( !state->seq && sink->start_fn ) {
|
|
VIPS_DEBUG_MSG( "sink_call_start: state = %p\n", state );
|
|
|
|
state->seq = sink->start_fn( sink->t, sink->a, sink->b );
|
|
|
|
if( !state->seq ) {
|
|
SinkBase *sink_base = (SinkBase *) sink;
|
|
|
|
vips_error( "vips_sink",
|
|
_( "start function failed for image \"%s\"" ),
|
|
sink_base->im->filename );
|
|
return( -1 );
|
|
}
|
|
}
|
|
|
|
return( 0 );
|
|
}
|
|
|
|
static int
|
|
sink_thread_state_build( VipsObject *object )
|
|
{
|
|
SinkThreadState *state = (SinkThreadState *) object;
|
|
Sink *sink = (Sink *) ((VipsThreadState *) state)->a;
|
|
|
|
if( !(state->reg = vips_region_new( sink->t )) ||
|
|
sink_call_start( sink, state ) )
|
|
return( -1 );
|
|
|
|
return( VIPS_OBJECT_CLASS(
|
|
sink_thread_state_parent_class )->build( object ) );
|
|
}
|
|
|
|
static void
|
|
sink_thread_state_class_init( SinkThreadStateClass *class )
|
|
{
|
|
GObjectClass *gobject_class = G_OBJECT_CLASS( class );
|
|
VipsObjectClass *object_class = VIPS_OBJECT_CLASS( class );
|
|
|
|
gobject_class->dispose = sink_thread_state_dispose;
|
|
|
|
object_class->build = sink_thread_state_build;
|
|
object_class->nickname = "sinkthreadstate";
|
|
object_class->description = _( "per-thread state for sink" );
|
|
}
|
|
|
|
static void
|
|
sink_thread_state_init( SinkThreadState *state )
|
|
{
|
|
state->seq = NULL;
|
|
state->reg = NULL;
|
|
}
|
|
|
|
VipsThreadState *
|
|
vips_sink_thread_state_new( VipsImage *im, void *a )
|
|
{
|
|
return( VIPS_THREAD_STATE( vips_object_new(
|
|
sink_thread_state_get_type(),
|
|
vips_thread_state_set, im, a ) ) );
|
|
}
|
|
|
|
static void
|
|
sink_free( Sink *sink )
|
|
{
|
|
VIPS_FREEF( g_object_unref, sink->t );
|
|
}
|
|
|
|
void
|
|
vips_sink_base_init( SinkBase *sink_base, VipsImage *image )
|
|
{
|
|
/* Always clear kill before we start looping. See the
|
|
* call to vips_image_get_kill() below.
|
|
*/
|
|
vips_image_set_kill( image, FALSE );
|
|
|
|
sink_base->im = image;
|
|
sink_base->x = 0;
|
|
sink_base->y = 0;
|
|
|
|
vips_get_tile_size( image,
|
|
&sink_base->tile_width, &sink_base->tile_height,
|
|
&sink_base->nlines );
|
|
|
|
sink_base->processed = 0;
|
|
}
|
|
|
|
static int
|
|
sink_init( Sink *sink,
|
|
VipsImage *image,
|
|
VipsStartFn start_fn, VipsGenerateFn generate_fn, VipsStopFn stop_fn,
|
|
void *a, void *b )
|
|
{
|
|
g_assert( generate_fn );
|
|
|
|
vips_sink_base_init( &sink->sink_base, image );
|
|
|
|
sink->t = NULL;
|
|
sink->start_fn = start_fn;
|
|
sink->generate_fn = generate_fn;
|
|
sink->stop_fn = stop_fn;
|
|
sink->a = a;
|
|
sink->b = b;
|
|
|
|
if( !(sink->t = vips_image_new()) ||
|
|
im_copy( sink->sink_base.im, sink->t ) ) {
|
|
sink_free( sink );
|
|
return( -1 );
|
|
}
|
|
|
|
return( 0 );
|
|
}
|
|
|
|
int
|
|
vips_sink_base_allocate( VipsThreadState *state, void *a, gboolean *stop )
|
|
{
|
|
SinkBase *sink_base = (SinkBase *) a;
|
|
|
|
VipsRect image, tile;
|
|
|
|
/* Has work requested early termination?
|
|
*/
|
|
if( state->stop ) {
|
|
*stop = TRUE;
|
|
|
|
return( 0 );
|
|
}
|
|
|
|
/* Is the state x/y OK? New line or maybe all done.
|
|
*/
|
|
if( sink_base->x >= sink_base->im->Xsize ) {
|
|
sink_base->x = 0;
|
|
sink_base->y += sink_base->tile_height;
|
|
|
|
if( sink_base->y >= sink_base->im->Ysize ) {
|
|
*stop = TRUE;
|
|
|
|
return( 0 );
|
|
}
|
|
}
|
|
|
|
/* x, y and buf are good: save params for thread.
|
|
*/
|
|
image.left = 0;
|
|
image.top = 0;
|
|
image.width = sink_base->im->Xsize;
|
|
image.height = sink_base->im->Ysize;
|
|
tile.left = sink_base->x;
|
|
tile.top = sink_base->y;
|
|
tile.width = sink_base->tile_width;
|
|
tile.height = sink_base->tile_height;
|
|
vips_rect_intersectrect( &image, &tile, &state->pos );
|
|
|
|
/* Move state on.
|
|
*/
|
|
sink_base->x += sink_base->tile_width;
|
|
|
|
/* Add the number of pixels we've just allocated to progress.
|
|
*/
|
|
sink_base->processed += state->pos.width * state->pos.height;
|
|
|
|
return( 0 );
|
|
}
|
|
|
|
static int
|
|
sink_work( VipsThreadState *state, void *a )
|
|
{
|
|
SinkThreadState *sstate = (SinkThreadState *) state;
|
|
Sink *sink = (Sink *) a;
|
|
|
|
if( vips_region_prepare( sstate->reg, &state->pos ) ||
|
|
sink->generate_fn( sstate->reg, sstate->seq,
|
|
sink->a, sink->b, &state->stop ) )
|
|
return( -1 );
|
|
|
|
return( 0 );
|
|
}
|
|
|
|
int
|
|
vips_sink_base_progress( void *a )
|
|
{
|
|
SinkBase *sink_base = (SinkBase *) a;
|
|
|
|
VIPS_DEBUG_MSG( "vips_sink_base_progress:\n" );
|
|
|
|
/* Trigger any eval callbacks on our source image and
|
|
* check for errors.
|
|
*/
|
|
vips_image_eval( sink_base->im, sink_base->processed );
|
|
if( vips_image_get_kill( sink_base->im ) )
|
|
return( -1 );
|
|
|
|
return( 0 );
|
|
}
|
|
|
|
/**
|
|
* vips_sink_tile:
|
|
* @im: scan over this image
|
|
* @tile_width: tile width
|
|
* @tile_height: tile height
|
|
* @start_fn: start sequences with this function
|
|
* @generate_fn: generate pixels with this function
|
|
* @stop_fn: stop sequences with this function
|
|
* @a: user data
|
|
* @b: user data
|
|
*
|
|
* Loops over an image. @generate is called for every pixel in the image, with
|
|
* the @reg argument being a region of pixels for processing.
|
|
*
|
|
* Each set of
|
|
* pixels is @tile_width by @tile_height pixels (less at the image edges).
|
|
* This is handy for things like
|
|
* writing a tiled TIFF image, where tiles have to be generated with a certain
|
|
* size.
|
|
*
|
|
* See also: vips_sink(), vips_get_tile_size().
|
|
*
|
|
* Returns: 0 on success, or -1 on error.
|
|
*/
|
|
int
|
|
vips_sink_tile( VipsImage *im,
|
|
int tile_width, int tile_height,
|
|
VipsStartFn start_fn, VipsGenerateFn generate_fn, VipsStopFn stop_fn,
|
|
void *a, void *b )
|
|
{
|
|
Sink sink;
|
|
int result;
|
|
|
|
g_assert( vips_object_sanity( VIPS_OBJECT( im ) ) );
|
|
|
|
/* We don't use this, but make sure it's set in case any old binaries
|
|
* are expecting it.
|
|
*/
|
|
im->Bbits = vips_format_sizeof( im->BandFmt ) << 3;
|
|
|
|
if( sink_init( &sink, im, start_fn, generate_fn, stop_fn, a, b ) )
|
|
return( -1 );
|
|
|
|
if( tile_width > 0 ) {
|
|
sink.sink_base.tile_width = tile_width;
|
|
sink.sink_base.tile_height = tile_height;
|
|
}
|
|
|
|
/* vips_sink_base_progress() signals progress on im, so we have to do
|
|
* pre/post on that too.
|
|
*/
|
|
vips_image_preeval( im );
|
|
|
|
result = vips_threadpool_run( im,
|
|
vips_sink_thread_state_new,
|
|
vips_sink_base_allocate,
|
|
sink_work,
|
|
vips_sink_base_progress,
|
|
&sink );
|
|
|
|
vips_image_posteval( im );
|
|
|
|
sink_free( &sink );
|
|
|
|
return( result );
|
|
}
|
|
|
|
/**
|
|
* vips_sink:
|
|
* @im: scan over this image
|
|
* @start_fn: start sequences with this function
|
|
* @generate_fn: generate pixels with this function
|
|
* @stop_fn: stop sequences with this function
|
|
* @a: user data
|
|
* @b: user data
|
|
*
|
|
* Loops over an image. @generate is called for every pixel in the image, with
|
|
* the @reg argument being a region of pixels for processing. vips_sink() is
|
|
* used to implement operations like #VipsAvg which have no image output.
|
|
*
|
|
* Each set of pixels is sized according to the requirements of the image
|
|
* pipeline that generated @im.
|
|
*
|
|
* See also: vips_image_generate(), vips_image_new().
|
|
*
|
|
* Returns: 0 on success, or -1 on error.
|
|
*/
|
|
int
|
|
vips_sink( VipsImage *im,
|
|
VipsStartFn start_fn, VipsGenerateFn generate_fn, VipsStopFn stop_fn,
|
|
void *a, void *b )
|
|
{
|
|
return( vips_sink_tile( im, -1, -1,
|
|
start_fn, generate_fn, stop_fn, a, b ) );
|
|
}
|