diff options
| author | Martin v. L?wis <martin@v.loewis.de> | 2012-04-20 14:37:17 +0200 |
|---|---|---|
| committer | Martin v. L?wis <martin@v.loewis.de> | 2012-04-20 14:37:17 +0200 |
| commit | b467205669cae187c9bbce311069c4875518bfae (patch) | |
| tree | ce7686f020917e8883d1818b8fadece2cc15fa06 /Include/pythread.h | |
| parent | f235cad91035d648e09ae7a1867fc9aa49ae8963 (diff) | |
| parent | 2c826ad61cf991d15646ae7bfac2d0cb34535cd8 (diff) | |
| download | cpython-b467205669cae187c9bbce311069c4875518bfae.tar.gz | |
merge 3.2: issue 14629
Diffstat (limited to 'Include/pythread.h')
| -rw-r--r-- | Include/pythread.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Include/pythread.h b/Include/pythread.h index 9806c61159..6e9f30337f 100644 --- a/Include/pythread.h +++ b/Include/pythread.h @@ -32,7 +32,7 @@ PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int); on a lock (see PyThread_acquire_lock_timed() below). PY_TIMEOUT_MAX is the highest usable value (in microseconds) of that type, and depends on the system threading API. - + NOTE: this isn't the same value as `_thread.TIMEOUT_MAX`. The _thread module exposes a higher-level API, with timeouts expressed in seconds and floating-point numbers allowed. @@ -74,6 +74,8 @@ PyAPI_FUNC(void) PyThread_release_lock(PyThread_type_lock); PyAPI_FUNC(size_t) PyThread_get_stacksize(void); PyAPI_FUNC(int) PyThread_set_stacksize(size_t); +PyAPI_FUNC(PyObject*) PyThread_GetInfo(void); + /* Thread Local Storage (TLS) API */ PyAPI_FUNC(int) PyThread_create_key(void); PyAPI_FUNC(void) PyThread_delete_key(int); |