From aadb2c3e769544347b503004eed078b04878965d Mon Sep 17 00:00:00 2001 From: dirk Date: Mon, 17 Mar 2014 05:43:50 +0000 Subject: [PATCH] Fix for debugging. --- MagickCore/semaphore.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/MagickCore/semaphore.c b/MagickCore/semaphore.c index 15037c0ed..901ae5327 100644 --- a/MagickCore/semaphore.c +++ b/MagickCore/semaphore.c @@ -293,6 +293,14 @@ MagickExport void LockSemaphoreInfo(SemaphoreInfo *semaphore_info) { assert(semaphore_info != (SemaphoreInfo *) NULL); assert(semaphore_info->signature == MagickSignature); +#if defined(MAGICKCORE_DEBUG) + if ((semaphore_info->reference_count > 0) && + (IsMagickThreadEqual(semaphore_info->id) != MagickFalse)) + { + (void) FormatLocaleFile(stderr,"Warning: unexpected recursive lock!\n"); + (void) fflush(stderr); + } +#endif #if defined(MAGICKCORE_OPENMP_SUPPORT) omp_set_lock((omp_lock_t *) &semaphore_info->mutex); #elif defined(MAGICKCORE_THREAD_SUPPORT) @@ -312,15 +320,9 @@ MagickExport void LockSemaphoreInfo(SemaphoreInfo *semaphore_info) EnterCriticalSection(&semaphore_info->mutex); #endif #if defined(MAGICKCORE_DEBUG) - if ((semaphore_info->reference_count > 0) && - (IsMagickThreadEqual(semaphore_info->id) != MagickFalse)) - { - (void) FormatLocaleFile(stderr,"Warning: unexpected recursive lock!\n"); - (void) fflush(stderr); - } -#endif semaphore_info->id=GetMagickThreadId(); semaphore_info->reference_count++; +#endif } /* -- 2.40.0