traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-29859: Fix error messages from return codes for pthread_* calls (GH-741)

This commit is contained in:
Daniel Birnstiel 2017-03-21 14:06:06 +01:00 committed by INADA Naoki
parent fff9a31a91
commit d7fa6b259e
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ What's New in Python 3.7.0 alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- bpo-29859: Show correct error messages when any of the pthread_* calls in
thread_pthread.h fails.
- bpo-29849: Fix a memory leak when an ImportError is raised during from import. - bpo-29849: Fix a memory leak when an ImportError is raised during from import.
- bpo-28856: Fix an oversight that %b format for bytes should support objects - bpo-28856: Fix an oversight that %b format for bytes should support objects

24
Python/thread_pthread.h
View File

@ -143,6 +143,8 @@ typedef struct {
} pthread_lock; } pthread_lock;
#define CHECK_STATUS(name) if (status != 0) { perror(name); error = 1; } #define CHECK_STATUS(name) if (status != 0) { perror(name); error = 1; }
#define CHECK_STATUS_PTHREAD(name) if (status != 0) { fprintf(stderr, \
"%s: %s\n", name, strerror(status)); error = 1; }
/* /*
* Initialization. * Initialization.
@ -417,7 +419,7 @@ PyThread_allocate_lock(void)
status = pthread_mutex_init(&lock->mut, status = pthread_mutex_init(&lock->mut,
pthread_mutexattr_default); pthread_mutexattr_default);
CHECK_STATUS("pthread_mutex_init"); CHECK_STATUS_PTHREAD("pthread_mutex_init");
/* Mark the pthread mutex underlying a Python mutex as /* Mark the pthread mutex underlying a Python mutex as
pure happens-before. We can't simply mark the pure happens-before. We can't simply mark the
Python-level mutex as a mutex because it can be Python-level mutex as a mutex because it can be
@ -427,7 +429,7 @@ PyThread_allocate_lock(void)
status = pthread_cond_init(&lock->lock_released, status = pthread_cond_init(&lock->lock_released,
pthread_condattr_default); pthread_condattr_default);
CHECK_STATUS("pthread_cond_init"); CHECK_STATUS_PTHREAD("pthread_cond_init");
if (error) { if (error) {
PyMem_RawFree((void *)lock); PyMem_RawFree((void *)lock);
@ -452,10 +454,10 @@ PyThread_free_lock(PyThread_type_lock lock)
* and must have the cond destroyed first. * and must have the cond destroyed first.
*/ */
status = pthread_cond_destroy( &thelock->lock_released ); status = pthread_cond_destroy( &thelock->lock_released );
CHECK_STATUS("pthread_cond_destroy"); CHECK_STATUS_PTHREAD("pthread_cond_destroy");
status = pthread_mutex_destroy( &thelock->mut ); status = pthread_mutex_destroy( &thelock->mut );
CHECK_STATUS("pthread_mutex_destroy"); CHECK_STATUS_PTHREAD("pthread_mutex_destroy");
PyMem_RawFree((void *)thelock); PyMem_RawFree((void *)thelock);
} }
@ -472,7 +474,7 @@ PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds,
lock, microseconds, intr_flag)); lock, microseconds, intr_flag));
status = pthread_mutex_lock( &thelock->mut ); status = pthread_mutex_lock( &thelock->mut );
CHECK_STATUS("pthread_mutex_lock[1]"); CHECK_STATUS_PTHREAD("pthread_mutex_lock[1]");
if (thelock->locked == 0) { if (thelock->locked == 0) {
success = PY_LOCK_ACQUIRED; success = PY_LOCK_ACQUIRED;
@ -494,13 +496,13 @@ PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds,
&thelock->mut, &ts); &thelock->mut, &ts);
if (status == ETIMEDOUT) if (status == ETIMEDOUT)
break; break;
CHECK_STATUS("pthread_cond_timed_wait"); CHECK_STATUS_PTHREAD("pthread_cond_timed_wait");
} }
else { else {
status = pthread_cond_wait( status = pthread_cond_wait(
&thelock->lock_released, &thelock->lock_released,
&thelock->mut); &thelock->mut);
CHECK_STATUS("pthread_cond_wait"); CHECK_STATUS_PTHREAD("pthread_cond_wait");
} }
if (intr_flag && status == 0 && thelock->locked) { if (intr_flag && status == 0 && thelock->locked) {
@ -518,7 +520,7 @@ PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds,
} }
if (success == PY_LOCK_ACQUIRED) thelock->locked = 1; if (success == PY_LOCK_ACQUIRED) thelock->locked = 1;
status = pthread_mutex_unlock( &thelock->mut ); status = pthread_mutex_unlock( &thelock->mut );
CHECK_STATUS("pthread_mutex_unlock[1]"); CHECK_STATUS_PTHREAD("pthread_mutex_unlock[1]");
if (error) success = PY_LOCK_FAILURE; if (error) success = PY_LOCK_FAILURE;
dprintf(("PyThread_acquire_lock_timed(%p, %lld, %d) -> %d\n", dprintf(("PyThread_acquire_lock_timed(%p, %lld, %d) -> %d\n",
@ -536,16 +538,16 @@ PyThread_release_lock(PyThread_type_lock lock)
dprintf(("PyThread_release_lock(%p) called\n", lock)); dprintf(("PyThread_release_lock(%p) called\n", lock));
status = pthread_mutex_lock( &thelock->mut ); status = pthread_mutex_lock( &thelock->mut );
CHECK_STATUS("pthread_mutex_lock[3]"); CHECK_STATUS_PTHREAD("pthread_mutex_lock[3]");
thelock->locked = 0; thelock->locked = 0;
/* wake up someone (anyone, if any) waiting on the lock */ /* wake up someone (anyone, if any) waiting on the lock */
status = pthread_cond_signal( &thelock->lock_released ); status = pthread_cond_signal( &thelock->lock_released );
CHECK_STATUS("pthread_cond_signal"); CHECK_STATUS_PTHREAD("pthread_cond_signal");
status = pthread_mutex_unlock( &thelock->mut ); status = pthread_mutex_unlock( &thelock->mut );
CHECK_STATUS("pthread_mutex_unlock[3]"); CHECK_STATUS_PTHREAD("pthread_mutex_unlock[3]");
} }
#endif /* USE_SEMAPHORES */ #endif /* USE_SEMAPHORES */