This commit is contained in:
John Cupitt 2009-11-01 10:39:17 +00:00
parent f1f0f9acbb
commit 4c1dd0f711
4 changed files with 16 additions and 13 deletions

View File

@ -36,8 +36,7 @@ autoheader
$LIBTOOLIZE --copy --force --automake
automake --add-missing --copy
swig -version
if test $?; then
swig -version > /dev/null
if [ $? -ne 0 ]; then
echo you need swig to build from SVN
fi

View File

@ -24,6 +24,7 @@
<xi:include href="xml/meta.xml"/>
<xi:include href="xml/region.xml"/>
<xi:include href="xml/generate.xml"/>
<xi:include href="xml/threadgroup.xml"/>
<xi:include href="xml/error.xml"/>
<xi:include href="xml/memory.xml"/>
<xi:include href="xml/buf.xml"/>
@ -34,6 +35,7 @@
<xi:include href="xml/arithmetic.xml"/>
<xi:include href="xml/boolean.xml"/>
<xi:include href="xml/relational.xml"/>
<xi:include href="xml/colour.xml"/>
</chapter>
<chapter>
@ -42,10 +44,8 @@
<xi:include href="xml/interpolate.xml"/>
<xi:include href="xml/object.xml"/>
<xi:include href="xml/proto.xml"/>
<xi:include href="xml/colour.xml"/>
<xi:include href="xml/transform.xml"/>
<xi:include href="xml/util.xml"/>
<xi:include href="xml/threadgroup.xml"/>
<xi:include href="xml/version.xml"/>
<xi:include href="xml/type.xml"/>
<xi:include href="xml/rect.xml"/>

View File

@ -35,6 +35,14 @@
extern "C" {
#endif /*__cplusplus*/
/* Stack size for each thread. We need to set this explicitly because some
* systems have a very low default.
FIXME ... should have an environment variable for this?
*/
#define IM__DEFAULT_STACK_SIZE (2 * 1024 * 1024)
#ifndef HAVE_THREADS
#undef g_thread_supported
#define g_thread_supported() (0)

View File

@ -39,17 +39,11 @@ extern "C" {
#include <vips/semaphore.h>
/* Stack size for each thread. We need to set this explicitly because some
* systems have a very low default.
FIXME ... should have an environment variable for this?
*/
#define IM__DEFAULT_STACK_SIZE (2 * 1024 * 1024)
/* What we track for each thread.
*/
typedef struct {
/* All private.
*/
/*< private >*/
REGION *reg; /* Region this thread operates on */
struct im__threadgroup_t *tg; /* Thread group we are part of */
@ -79,6 +73,8 @@ typedef int (*im__work_fn)( im_thread_t *thr,
/* What we track for a group of threads working together.
*/
typedef struct im__threadgroup_t {
/* All private.
*/
/*< private >*/
int zombie; /* Set if has been freed */