diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-03-23 15:48:39 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2017-03-23 14:48:39 +0100 |
| commit | aefa7ebf0ff0f73feee7ab24f4cdcb2014d83ee5 (patch) | |
| tree | 39560da26771d1e10add697e558bb727639fdbb0 /Python/thread_pthread.h | |
| parent | 1e2147b9d75a64df370a9393c2b5b9d170dc0afd (diff) | |
| download | cpython-git-aefa7ebf0ff0f73feee7ab24f4cdcb2014d83ee5.tar.gz | |
bpo-6532: Make the thread id an unsigned integer. (#781)
* bpo-6532: Make the thread id an unsigned integer.
From C API side the type of results of PyThread_start_new_thread() and
PyThread_get_thread_ident(), the id parameter of
PyThreadState_SetAsyncExc(), and the thread_id field of PyThreadState
changed from "long" to "unsigned long".
* Restore a check in thread_get_ident().
Diffstat (limited to 'Python/thread_pthread.h')
| -rw-r--r-- | Python/thread_pthread.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index ba7393f03d..b95840ce2d 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -184,7 +184,7 @@ PyThread__init_thread(void) */ -long +unsigned long PyThread_start_new_thread(void (*func)(void *), void *arg) { pthread_t th; @@ -202,7 +202,7 @@ PyThread_start_new_thread(void (*func)(void *), void *arg) #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) if (pthread_attr_init(&attrs) != 0) - return -1; + return PYTHREAD_INVALID_THREAD_ID; #endif #if defined(THREAD_STACK_SIZE) tss = (_pythread_stacksize != 0) ? _pythread_stacksize @@ -210,7 +210,7 @@ PyThread_start_new_thread(void (*func)(void *), void *arg) if (tss != 0) { if (pthread_attr_setstacksize(&attrs, tss) != 0) { pthread_attr_destroy(&attrs); - return -1; + return PYTHREAD_INVALID_THREAD_ID; } } #endif @@ -232,31 +232,31 @@ PyThread_start_new_thread(void (*func)(void *), void *arg) pthread_attr_destroy(&attrs); #endif if (status != 0) - return -1; + return PYTHREAD_INVALID_THREAD_ID; pthread_detach(th); #if SIZEOF_PTHREAD_T <= SIZEOF_LONG - return (long) th; + return (unsigned long) th; #else - return (long) *(long *) &th; + return (unsigned long) *(unsigned long *) &th; #endif } /* XXX This implementation is considered (to quote Tim Peters) "inherently hosed" because: - It does not guarantee the promise that a non-zero integer is returned. - - The cast to long is inherently unsafe. + - The cast to unsigned long is inherently unsafe. - It is not clear that the 'volatile' (for AIX?) are any longer necessary. */ -long +unsigned long PyThread_get_thread_ident(void) { volatile pthread_t threadid; if (!initialized) PyThread_init_thread(); threadid = pthread_self(); - return (long) threadid; + return (unsigned long) threadid; } void |