mirror of
https://github.com/python/cpython.git
synced 2024-11-25 02:44:06 +08:00
6aa2d1fec7
svn+ssh://pythondev@svn.python.org/python/trunk ........ r65459 | gregory.p.smith | 2008-08-04 00:13:29 +0000 (Mon, 04 Aug 2008) | 4 lines - Issue #1857: subprocess.Popen.poll gained an additional _deadstate keyword argument in python 2.5, this broke code that subclassed Popen to include its own poll method. Fixed my moving _deadstate to an _internal_poll method. ........ r65472 | andrew.kuchling | 2008-08-04 01:43:43 +0000 (Mon, 04 Aug 2008) | 3 lines Bug 3228: Explicitly supply the file mode to avoid creating executable files, and add corresponding tests. Possible 2.5 backport candidate ........ r65481 | gregory.p.smith | 2008-08-04 07:33:37 +0000 (Mon, 04 Aug 2008) | 22 lines Adds a sanity check to avoid a *very rare* infinite loop due to a corrupt tls key list data structure in the thread startup path. This change is a companion to r60148 which already successfully dealt with a similar issue on thread shutdown. In particular this loop has been observed happening from this call path: #0 in find_key () #1 in PyThread_set_key_value () #2 in _PyGILState_NoteThreadState () #3 in PyThreadState_New () #4 in t_bootstrap () #5 in pthread_start_thread () I don't know how this happens but it does, *very* rarely. On more than one hardware platform. I have not been able to reproduce it manually. (A flaky mutex implementation on the system in question is one hypothesis). As with r60148, the spinning we managed to observe in the wild was due to a single list element pointing back upon itself. ........ r65518 | mark.dickinson | 2008-08-04 21:30:09 +0000 (Mon, 04 Aug 2008) | 7 lines Issue #1481296: (again!) Make conversion of a float NaN to an int or long raise ValueError instead of returning 0. Also, change the error message for conversion of an infinity to an integer, replacing 'long' by 'integer', so that it's appropriate for both long(float('inf')) and int(float('inf')). ........ r65536 | andrew.kuchling | 2008-08-05 01:00:57 +0000 (Tue, 05 Aug 2008) | 1 line Bug 3228: take a test from Niels Gustaebel's patch, and based on his patch, check for having os.stat available ........ r65581 | guido.van.rossum | 2008-08-07 18:51:38 +0000 (Thu, 07 Aug 2008) | 3 lines Patch by Ian Charnas from issue 3517. Add F_FULLFSYNC if it exists (OS X only so far). ........ r65609 | antoine.pitrou | 2008-08-09 17:22:25 +0000 (Sat, 09 Aug 2008) | 3 lines #3205: bz2 iterator fails silently on MemoryError ........ r65637 | georg.brandl | 2008-08-11 09:07:59 +0000 (Mon, 11 Aug 2008) | 3 lines - Issue #3537: Fix an assertion failure when an empty but presized dict object was stored in the freelist. ........ r65641 | jesse.noller | 2008-08-11 14:28:07 +0000 (Mon, 11 Aug 2008) | 2 lines Remove the fqdn call for issue 3270 ........ r65644 | antoine.pitrou | 2008-08-11 17:21:36 +0000 (Mon, 11 Aug 2008) | 3 lines #3134: shutil referenced undefined WindowsError symbol ........ r65645 | jesse.noller | 2008-08-11 19:00:15 +0000 (Mon, 11 Aug 2008) | 2 lines Fix the connection refused error part of issue 3419, use errno module instead of a static list of possible connection refused messages. ........
422 lines
11 KiB
C
422 lines
11 KiB
C
|
|
/* Thread package.
|
|
This is intended to be usable independently from Python.
|
|
The implementation for system foobar is in a file thread_foobar.h
|
|
which is included by this file dependent on config settings.
|
|
Stuff shared by all thread_*.h files is collected here. */
|
|
|
|
#include "Python.h"
|
|
|
|
|
|
#ifndef _POSIX_THREADS
|
|
/* This means pthreads are not implemented in libc headers, hence the macro
|
|
not present in unistd.h. But they still can be implemented as an external
|
|
library (e.g. gnu pth in pthread emulation) */
|
|
# ifdef HAVE_PTHREAD_H
|
|
# include <pthread.h> /* _POSIX_THREADS */
|
|
# endif
|
|
#endif
|
|
|
|
#ifndef DONT_HAVE_STDIO_H
|
|
#include <stdio.h>
|
|
#endif
|
|
|
|
#include <stdlib.h>
|
|
|
|
#ifdef __sgi
|
|
#ifndef HAVE_PTHREAD_H /* XXX Need to check in configure.in */
|
|
#undef _POSIX_THREADS
|
|
#endif
|
|
#endif
|
|
|
|
#include "pythread.h"
|
|
|
|
#ifndef _POSIX_THREADS
|
|
|
|
#ifdef __sgi
|
|
#define SGI_THREADS
|
|
#endif
|
|
|
|
#ifdef HAVE_THREAD_H
|
|
#define SOLARIS_THREADS
|
|
#endif
|
|
|
|
#if defined(sun) && !defined(SOLARIS_THREADS)
|
|
#define SUN_LWP
|
|
#endif
|
|
|
|
/* Check if we're running on HP-UX and _SC_THREADS is defined. If so, then
|
|
enough of the Posix threads package is implimented to support python
|
|
threads.
|
|
|
|
This is valid for HP-UX 11.23 running on an ia64 system. If needed, add
|
|
a check of __ia64 to verify that we're running on a ia64 system instead
|
|
of a pa-risc system.
|
|
*/
|
|
#ifdef __hpux
|
|
#ifdef _SC_THREADS
|
|
#define _POSIX_THREADS
|
|
#endif
|
|
#endif
|
|
|
|
#endif /* _POSIX_THREADS */
|
|
|
|
|
|
#ifdef Py_DEBUG
|
|
static int thread_debug = 0;
|
|
#define dprintf(args) (void)((thread_debug & 1) && printf args)
|
|
#define d2printf(args) ((thread_debug & 8) && printf args)
|
|
#else
|
|
#define dprintf(args)
|
|
#define d2printf(args)
|
|
#endif
|
|
|
|
static int initialized;
|
|
|
|
static void PyThread__init_thread(void); /* Forward */
|
|
|
|
void
|
|
PyThread_init_thread(void)
|
|
{
|
|
#ifdef Py_DEBUG
|
|
char *p = Py_GETENV("PYTHONTHREADDEBUG");
|
|
|
|
if (p) {
|
|
if (*p)
|
|
thread_debug = atoi(p);
|
|
else
|
|
thread_debug = 1;
|
|
}
|
|
#endif /* Py_DEBUG */
|
|
if (initialized)
|
|
return;
|
|
initialized = 1;
|
|
dprintf(("PyThread_init_thread called\n"));
|
|
PyThread__init_thread();
|
|
}
|
|
|
|
/* Support for runtime thread stack size tuning.
|
|
A value of 0 means using the platform's default stack size
|
|
or the size specified by the THREAD_STACK_SIZE macro. */
|
|
static size_t _pythread_stacksize = 0;
|
|
|
|
#ifdef SGI_THREADS
|
|
#include "thread_sgi.h"
|
|
#endif
|
|
|
|
#ifdef SOLARIS_THREADS
|
|
#include "thread_solaris.h"
|
|
#endif
|
|
|
|
#ifdef SUN_LWP
|
|
#include "thread_lwp.h"
|
|
#endif
|
|
|
|
#ifdef HAVE_PTH
|
|
#include "thread_pth.h"
|
|
#undef _POSIX_THREADS
|
|
#endif
|
|
|
|
#ifdef _POSIX_THREADS
|
|
#include "thread_pthread.h"
|
|
#endif
|
|
|
|
#ifdef C_THREADS
|
|
#include "thread_cthread.h"
|
|
#endif
|
|
|
|
#ifdef NT_THREADS
|
|
#include "thread_nt.h"
|
|
#endif
|
|
|
|
#ifdef OS2_THREADS
|
|
#include "thread_os2.h"
|
|
#endif
|
|
|
|
#ifdef WINCE_THREADS
|
|
#include "thread_wince.h"
|
|
#endif
|
|
|
|
#ifdef PLAN9_THREADS
|
|
#include "thread_plan9.h"
|
|
#endif
|
|
|
|
#ifdef ATHEOS_THREADS
|
|
#include "thread_atheos.h"
|
|
#endif
|
|
|
|
/*
|
|
#ifdef FOOBAR_THREADS
|
|
#include "thread_foobar.h"
|
|
#endif
|
|
*/
|
|
|
|
/* return the current thread stack size */
|
|
size_t
|
|
PyThread_get_stacksize(void)
|
|
{
|
|
return _pythread_stacksize;
|
|
}
|
|
|
|
/* Only platforms defining a THREAD_SET_STACKSIZE() macro
|
|
in thread_<platform>.h support changing the stack size.
|
|
Return 0 if stack size is valid,
|
|
-1 if stack size value is invalid,
|
|
-2 if setting stack size is not supported. */
|
|
int
|
|
PyThread_set_stacksize(size_t size)
|
|
{
|
|
#if defined(THREAD_SET_STACKSIZE)
|
|
return THREAD_SET_STACKSIZE(size);
|
|
#else
|
|
return -2;
|
|
#endif
|
|
}
|
|
|
|
#ifndef Py_HAVE_NATIVE_TLS
|
|
/* If the platform has not supplied a platform specific
|
|
TLS implementation, provide our own.
|
|
|
|
This code stolen from "thread_sgi.h", where it was the only
|
|
implementation of an existing Python TLS API.
|
|
*/
|
|
/* ------------------------------------------------------------------------
|
|
Per-thread data ("key") support.
|
|
|
|
Use PyThread_create_key() to create a new key. This is typically shared
|
|
across threads.
|
|
|
|
Use PyThread_set_key_value(thekey, value) to associate void* value with
|
|
thekey in the current thread. Each thread has a distinct mapping of thekey
|
|
to a void* value. Caution: if the current thread already has a mapping
|
|
for thekey, value is ignored.
|
|
|
|
Use PyThread_get_key_value(thekey) to retrieve the void* value associated
|
|
with thekey in the current thread. This returns NULL if no value is
|
|
associated with thekey in the current thread.
|
|
|
|
Use PyThread_delete_key_value(thekey) to forget the current thread's associated
|
|
value for thekey. PyThread_delete_key(thekey) forgets the values associated
|
|
with thekey across *all* threads.
|
|
|
|
While some of these functions have error-return values, none set any
|
|
Python exception.
|
|
|
|
None of the functions does memory management on behalf of the void* values.
|
|
You need to allocate and deallocate them yourself. If the void* values
|
|
happen to be PyObject*, these functions don't do refcount operations on
|
|
them either.
|
|
|
|
The GIL does not need to be held when calling these functions; they supply
|
|
their own locking. This isn't true of PyThread_create_key(), though (see
|
|
next paragraph).
|
|
|
|
There's a hidden assumption that PyThread_create_key() will be called before
|
|
any of the other functions are called. There's also a hidden assumption
|
|
that calls to PyThread_create_key() are serialized externally.
|
|
------------------------------------------------------------------------ */
|
|
|
|
/* A singly-linked list of struct key objects remembers all the key->value
|
|
* associations. File static keyhead heads the list. keymutex is used
|
|
* to enforce exclusion internally.
|
|
*/
|
|
struct key {
|
|
/* Next record in the list, or NULL if this is the last record. */
|
|
struct key *next;
|
|
|
|
/* The thread id, according to PyThread_get_thread_ident(). */
|
|
long id;
|
|
|
|
/* The key and its associated value. */
|
|
int key;
|
|
void *value;
|
|
};
|
|
|
|
static struct key *keyhead = NULL;
|
|
static PyThread_type_lock keymutex = NULL;
|
|
static int nkeys = 0; /* PyThread_create_key() hands out nkeys+1 next */
|
|
|
|
/* Internal helper.
|
|
* If the current thread has a mapping for key, the appropriate struct key*
|
|
* is returned. NB: value is ignored in this case!
|
|
* If there is no mapping for key in the current thread, then:
|
|
* If value is NULL, NULL is returned.
|
|
* Else a mapping of key to value is created for the current thread,
|
|
* and a pointer to a new struct key* is returned; except that if
|
|
* malloc() can't find room for a new struct key*, NULL is returned.
|
|
* So when value==NULL, this acts like a pure lookup routine, and when
|
|
* value!=NULL, this acts like dict.setdefault(), returning an existing
|
|
* mapping if one exists, else creating a new mapping.
|
|
*
|
|
* Caution: this used to be too clever, trying to hold keymutex only
|
|
* around the "p->next = keyhead; keyhead = p" pair. That allowed
|
|
* another thread to mutate the list, via key deletion, concurrent with
|
|
* find_key() crawling over the list. Hilarity ensued. For example, when
|
|
* the for-loop here does "p = p->next", p could end up pointing at a
|
|
* record that PyThread_delete_key_value() was concurrently free()'ing.
|
|
* That could lead to anything, from failing to find a key that exists, to
|
|
* segfaults. Now we lock the whole routine.
|
|
*/
|
|
static struct key *
|
|
find_key(int key, void *value)
|
|
{
|
|
struct key *p, *prev_p;
|
|
long id = PyThread_get_thread_ident();
|
|
|
|
if (!keymutex)
|
|
return NULL;
|
|
PyThread_acquire_lock(keymutex, 1);
|
|
prev_p = NULL;
|
|
for (p = keyhead; p != NULL; p = p->next) {
|
|
if (p->id == id && p->key == key)
|
|
goto Done;
|
|
/* Sanity check. These states should never happen but if
|
|
* they do we must abort. Otherwise we'll end up spinning in
|
|
* in a tight loop with the lock held. A similar check is done
|
|
* in pystate.c tstate_delete_common(). */
|
|
if (p == prev_p)
|
|
Py_FatalError("tls find_key: small circular list(!)");
|
|
prev_p = p;
|
|
if (p->next == keyhead)
|
|
Py_FatalError("tls find_key: circular list(!)");
|
|
}
|
|
if (value == NULL) {
|
|
assert(p == NULL);
|
|
goto Done;
|
|
}
|
|
p = (struct key *)malloc(sizeof(struct key));
|
|
if (p != NULL) {
|
|
p->id = id;
|
|
p->key = key;
|
|
p->value = value;
|
|
p->next = keyhead;
|
|
keyhead = p;
|
|
}
|
|
Done:
|
|
PyThread_release_lock(keymutex);
|
|
return p;
|
|
}
|
|
|
|
/* Return a new key. This must be called before any other functions in
|
|
* this family, and callers must arrange to serialize calls to this
|
|
* function. No violations are detected.
|
|
*/
|
|
int
|
|
PyThread_create_key(void)
|
|
{
|
|
/* All parts of this function are wrong if it's called by multiple
|
|
* threads simultaneously.
|
|
*/
|
|
if (keymutex == NULL)
|
|
keymutex = PyThread_allocate_lock();
|
|
return ++nkeys;
|
|
}
|
|
|
|
/* Forget the associations for key across *all* threads. */
|
|
void
|
|
PyThread_delete_key(int key)
|
|
{
|
|
struct key *p, **q;
|
|
|
|
PyThread_acquire_lock(keymutex, 1);
|
|
q = &keyhead;
|
|
while ((p = *q) != NULL) {
|
|
if (p->key == key) {
|
|
*q = p->next;
|
|
free((void *)p);
|
|
/* NB This does *not* free p->value! */
|
|
}
|
|
else
|
|
q = &p->next;
|
|
}
|
|
PyThread_release_lock(keymutex);
|
|
}
|
|
|
|
/* Confusing: If the current thread has an association for key,
|
|
* value is ignored, and 0 is returned. Else an attempt is made to create
|
|
* an association of key to value for the current thread. 0 is returned
|
|
* if that succeeds, but -1 is returned if there's not enough memory
|
|
* to create the association. value must not be NULL.
|
|
*/
|
|
int
|
|
PyThread_set_key_value(int key, void *value)
|
|
{
|
|
struct key *p;
|
|
|
|
assert(value != NULL);
|
|
p = find_key(key, value);
|
|
if (p == NULL)
|
|
return -1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/* Retrieve the value associated with key in the current thread, or NULL
|
|
* if the current thread doesn't have an association for key.
|
|
*/
|
|
void *
|
|
PyThread_get_key_value(int key)
|
|
{
|
|
struct key *p = find_key(key, NULL);
|
|
|
|
if (p == NULL)
|
|
return NULL;
|
|
else
|
|
return p->value;
|
|
}
|
|
|
|
/* Forget the current thread's association for key, if any. */
|
|
void
|
|
PyThread_delete_key_value(int key)
|
|
{
|
|
long id = PyThread_get_thread_ident();
|
|
struct key *p, **q;
|
|
|
|
PyThread_acquire_lock(keymutex, 1);
|
|
q = &keyhead;
|
|
while ((p = *q) != NULL) {
|
|
if (p->key == key && p->id == id) {
|
|
*q = p->next;
|
|
free((void *)p);
|
|
/* NB This does *not* free p->value! */
|
|
break;
|
|
}
|
|
else
|
|
q = &p->next;
|
|
}
|
|
PyThread_release_lock(keymutex);
|
|
}
|
|
|
|
/* Forget everything not associated with the current thread id.
|
|
* This function is called from PyOS_AfterFork(). It is necessary
|
|
* because other thread ids which were in use at the time of the fork
|
|
* may be reused for new threads created in the forked process.
|
|
*/
|
|
void
|
|
PyThread_ReInitTLS(void)
|
|
{
|
|
long id = PyThread_get_thread_ident();
|
|
struct key *p, **q;
|
|
|
|
if (!keymutex)
|
|
return;
|
|
|
|
/* As with interpreter_lock in PyEval_ReInitThreads()
|
|
we just create a new lock without freeing the old one */
|
|
keymutex = PyThread_allocate_lock();
|
|
|
|
/* Delete all keys which do not match the current thread id */
|
|
q = &keyhead;
|
|
while ((p = *q) != NULL) {
|
|
if (p->id != id) {
|
|
*q = p->next;
|
|
free((void *)p);
|
|
/* NB This does *not* free p->value! */
|
|
}
|
|
else
|
|
q = &p->next;
|
|
}
|
|
}
|
|
|
|
#endif /* Py_HAVE_NATIVE_TLS */
|