Attachment 90651 Details for Bug 86281 – Patch to remove unnecessary locking

[patch] Patch to remove unnecessary locking

d-python-thread (text/plain), 1.29 KB, created by Ulrich Drepper on 2003-03-18 20:41:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ulrich Drepper

Created: 2003-03-18 20:41:52 UTC

Size: 1.29 KB

patch

obsolete

>--- Python-2.2.2/Python/thread_pthread.h.ud	2003-03-18 11:45:13.000000000 -0800
>+++ Python-2.2.2/Python/thread_pthread.h	2003-03-18 12:32:38.000000000 -0800
>@@ -359,27 +359,23 @@ PyThread_acquire_lock(PyThread_type_lock
> 	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 ) {
>+	if (__builtin_expect(!success && waitflag, 0)) {
> 		/* 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;

Actions: View | Diff

Attachments on bug 86281: 90651