X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=MagickWand%2Fwand-view.c;h=1cbf6ee7d830f11e9bc519663b4b40a9974181f4;hb=de984cdc3631106b1cbbb8d3972b76a0fc27e8e8;hp=316cc59fc3a4039335bb2750c3866257e2335f37;hpb=76fa3140c8390bd6c1b2ad961655b1190853d3cd;p=imagemagick diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c index 316cc59fc..1cbf6ee7d 100644 --- a/MagickWand/wand-view.c +++ b/MagickWand/wand-view.c @@ -18,11 +18,11 @@ % MagickWand Wand View Methods % % % % Software Design % -% John Cristy % +% Cristy % % March 2003 % % % % % -% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization % +% Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -80,9 +80,6 @@ struct _WandView CacheView *view; - size_t - number_threads; - PixelWand ***pixel_wands; @@ -143,10 +140,9 @@ WandExport WandView *CloneWandView(const WandView *wand_view) wand_view->exception); clone_view->view=CloneCacheView(wand_view->view); clone_view->extent=wand_view->extent; - clone_view->number_threads=wand_view->number_threads; clone_view->exception=AcquireExceptionInfo(); InheritException(clone_view->exception,wand_view->exception); - for (i=0; i < (ssize_t) wand_view->number_threads; i++) + for (i=0; i < (ssize_t) GetMagickResourceLimit(ThreadResource); i++) clone_view->pixel_wands[i]=ClonePixelWands((const PixelWand **) wand_view->pixel_wands[i],wand_view->extent.width); clone_view->debug=wand_view->debug; @@ -180,13 +176,13 @@ WandExport WandView *CloneWandView(const WandView *wand_view) */ static PixelWand ***DestroyPixelsThreadSet(PixelWand ***pixel_wands, - const size_t number_wands,const size_t number_threads) + const size_t number_wands) { register ssize_t i; assert(pixel_wands != (PixelWand ***) NULL); - for (i=0; i < (ssize_t) number_threads; i++) + for (i=0; i < (ssize_t) GetMagickResourceLimit(ThreadResource); i++) if (pixel_wands[i] != (PixelWand **) NULL) pixel_wands[i]=DestroyPixelWands(pixel_wands[i],number_wands); pixel_wands=(PixelWand ***) RelinquishMagickMemory(pixel_wands); @@ -198,7 +194,7 @@ WandExport WandView *DestroyWandView(WandView *wand_view) assert(wand_view != (WandView *) NULL); assert(wand_view->signature == WandSignature); wand_view->pixel_wands=DestroyPixelsThreadSet(wand_view->pixel_wands, - wand_view->extent.width,wand_view->number_threads); + wand_view->extent.width); wand_view->image=DestroyImage(wand_view->image); wand_view->view=DestroyCacheView(wand_view->view); wand_view->exception=DestroyExceptionInfo(wand_view->exception); @@ -273,6 +269,11 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source, MagickOffsetType progress; +#if defined(MAGICKCORE_OPENMP_SUPPORT) + size_t + height; +#endif + ssize_t y; @@ -289,7 +290,9 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) + height=source->extent.height-source->extent.y; + #pragma omp parallel for schedule(static,4) shared(progress,status) \ + magick_threads(source_image,destination_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -524,6 +527,11 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source, MagickOffsetType progress; +#if defined(MAGICKCORE_OPENMP_SUPPORT) + size_t + height; +#endif + ssize_t y; @@ -535,7 +543,9 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) + height=source->extent.height-source->extent.y; + #pragma omp parallel for schedule(static,4) shared(progress,status) \ + magick_threads(source_image,source_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -704,8 +714,7 @@ WandExport MagickBooleanType IsWandView(const WandView *wand_view) % */ -static PixelWand ***AcquirePixelsThreadSet(const size_t number_wands, - const size_t number_threads) +static PixelWand ***AcquirePixelsThreadSet(const size_t number_wands) { PixelWand ***pixel_wands; @@ -713,6 +722,10 @@ static PixelWand ***AcquirePixelsThreadSet(const size_t number_wands, register ssize_t i; + size_t + number_threads; + + number_threads=GetOpenMPMaximumThreads(); pixel_wands=(PixelWand ***) AcquireQuantumMemory(number_threads, sizeof(*pixel_wands)); if (pixel_wands == (PixelWand ***) NULL) @@ -722,7 +735,7 @@ static PixelWand ***AcquirePixelsThreadSet(const size_t number_wands, { pixel_wands[i]=NewPixelWands(number_wands); if (pixel_wands[i] == (PixelWand **) NULL) - return(DestroyPixelsThreadSet(pixel_wands,number_wands,number_threads)); + return(DestroyPixelsThreadSet(pixel_wands,number_wands)); } return(pixel_wands); } @@ -751,9 +764,7 @@ WandExport WandView *NewWandView(MagickWand *wand) wand_view->view=AcquireVirtualCacheView(wand_view->wand->images,exception); wand_view->extent.width=wand->images->columns; wand_view->extent.height=wand->images->rows; - wand_view->number_threads=GetOpenMPMaximumThreads(); - wand_view->pixel_wands=AcquirePixelsThreadSet(wand_view->extent.width, - wand_view->number_threads); + wand_view->pixel_wands=AcquirePixelsThreadSet(wand_view->extent.width); wand_view->exception=exception; if (wand_view->pixel_wands == (PixelWand ***) NULL) ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed", @@ -817,10 +828,8 @@ WandExport WandView *NewWandViewExtent(MagickWand *wand,const ssize_t x, wand_view->extent.height=height; wand_view->extent.x=x; wand_view->extent.y=y; - wand_view->number_threads=GetOpenMPMaximumThreads(); wand_view->exception=exception; - wand_view->pixel_wands=AcquirePixelsThreadSet(wand_view->extent.width, - wand_view->number_threads); + wand_view->pixel_wands=AcquirePixelsThreadSet(wand_view->extent.width); if (wand_view->pixel_wands == (PixelWand ***) NULL) ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed", GetExceptionMessage(errno)); @@ -917,6 +926,11 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination, MagickOffsetType progress; +#if defined(MAGICKCORE_OPENMP_SUPPORT) + size_t + height; +#endif + ssize_t y; @@ -932,7 +946,9 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static) shared(progress,status) num_threads(destination->number_threads) + height=destination->extent.height-destination->extent.y; + #pragma omp parallel for schedule(static,4) shared(progress,status) \ + magick_threads(destination_image,destination_image,height,1) #endif for (y=destination->extent.y; y < (ssize_t) destination->extent.height; y++) { @@ -990,41 +1006,6 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination, % % % % % % -% S e t W a n d V i e w T h r e a d s % -% % -% % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% SetWandViewThreads() sets the number of threads in a thread team. -% -% The format of the SetWandViewDescription method is: -% -% void SetWandViewThreads(WandView *image_view, -% const size_t number_threads) -% -% A description of each parameter follows: -% -% o image_view: the image view. -% -% o number_threads: the number of threads in a thread team. -% -*/ -MagickExport void SetWandViewThreads(WandView *image_view, - const size_t number_threads) -{ - assert(image_view != (WandView *) NULL); - assert(image_view->signature == MagickSignature); - image_view->number_threads=number_threads; - if (number_threads > GetOpenMPMaximumThreads()) - image_view->number_threads=GetOpenMPMaximumThreads(); -} - -/* -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% % -% % % T r a n s f e r W a n d V i e w I t e r a t o r % % % % % @@ -1081,6 +1062,11 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source, MagickOffsetType progress; +#if defined(MAGICKCORE_OPENMP_SUPPORT) + size_t + height; +#endif + ssize_t y; @@ -1097,7 +1083,9 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) + height=source->extent.height-source->extent.y; + #pragma omp parallel for schedule(static,4) shared(progress,status) \ + magick_threads(source_image,destination_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -1230,6 +1218,11 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source, MagickOffsetType progress; +#if defined(MAGICKCORE_OPENMP_SUPPORT) + size_t + height; +#endif + ssize_t y; @@ -1244,7 +1237,9 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) + height=source->extent.height-source->extent.y; + #pragma omp parallel for schedule(static,4) shared(progress,status) \ + magick_threads(source_image,source_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) {