From: Martin v. Löwis Date: Fri, 18 Apr 2003 11:11:09 +0000 (+0000) Subject: Patch #711835: Remove unnecessary lock operations. Will backport to 2.2. X-Git-Tag: v2.3c1~1130 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1509a152b37c04022b006ce1674f7c78453c388b;p=python Patch #711835: Remove unnecessary lock operations. Will backport to 2.2. --- diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index e30982fc4f..2596af55c6 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -497,27 +497,23 @@ PyThread_acquire_lock(PyThread_type_lock lock, int waitflag) status = pthread_mutex_lock( &thelock->mut ); CHECK_STATUS("pthread_mutex_lock[1]"); success = thelock->locked == 0; - if (success) thelock->locked = 1; - status = pthread_mutex_unlock( &thelock->mut ); - CHECK_STATUS("pthread_mutex_unlock[1]"); if ( !success && waitflag ) { /* continue trying until we get the lock */ /* mut must be locked by me -- part of the condition * protocol */ - status = pthread_mutex_lock( &thelock->mut ); - CHECK_STATUS("pthread_mutex_lock[2]"); while ( thelock->locked ) { status = pthread_cond_wait(&thelock->lock_released, &thelock->mut); CHECK_STATUS("pthread_cond_wait"); } - thelock->locked = 1; - status = pthread_mutex_unlock( &thelock->mut ); - CHECK_STATUS("pthread_mutex_unlock[2]"); success = 1; } + if (success) thelock->locked = 1; + status = pthread_mutex_unlock( &thelock->mut ); + CHECK_STATUS("pthread_mutex_unlock[1]"); + if (error) success = 0; dprintf(("PyThread_acquire_lock(%p, %d) -> %d\n", lock, waitflag, success)); return success;