cpython-lru_cache-weakref: Python/thread.c annotate

annotate Python/thread.c @ 42084:229c28cb9afb

Merged revisions 55817-55961 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines PEP 3119 -- the abc module. ................ r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines Implement part of PEP 3119 -- One Trick Ponies. ................ r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines Different way to do one trick ponies, allowing registration (per PEP strawman). ................ r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines Make sure that the magic looking for __hash__ (etc.) doesn't apply to real subclasses of Hashable. ................ r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines Add some more examples, e.g. generators and dict views. ................ r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines keys() and items() *are* containers -- just values() isn't. ................ r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines PEP 3127: new octal literals, binary literals. ................ r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines Some octal literal fixes in Tools. ................ r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines Tokenizer changes for PEP 3127. ................ r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines Some docs for PEP 3127. ................ r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines Missed a place in intobject.c. Is that used anymore anyway? ................ r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines Merged revisions 55729-55868 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines SF 1668596/1720897: distutils now copies data files even if package_dir is empty. This needs to be backported. I'm too tired tonight. It would be great if someone backports this if the buildbots are ok with it. Otherwise, I will try to get to it tomorrow. ........ r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines Bug #1722484: remove docstrings again when running with -OO. ........ r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines Fix wrong issue number. ........ r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines Have configure raise an error when building on AtheOS. Code specific to AtheOS will be removed in Python 2.7. ........ r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line Update expected birthday of 2.6 ........ r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines Backout the original 'fix' to 1721309 which had no effect. Different versions of Berkeley DB handle this differently. The comments and bug report should have the details. Memory is allocated in 4.4 (and presumably earlier), but not in 4.5. Thus 4.5 has the free error, but not earlier versions. Mostly update comments, plus make the free conditional. This fix was already applied to the 2.5 branch. ........ r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead of ``\s*``. This prevents patterns from "stealing" bits from other patterns in order to make a match work. Closes bug #1730389. Will be backported. ........ r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different from Linux's. Just fix the build for now but the code doesn't support the complete capability of HCI on FreeBSD yet. ........ r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it reads a file that ends with incomplete sequence and sizehint argument for .read() is specified. ........ r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines Fix for Windows: close a temporary file before trying to delete it. ........ r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines Patch by Tim Delany (missing DECREF). SF #1731330. ........ r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O). ........ r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines FTP.ntransfercmd method now uses create_connection when passive, using the timeout received in connection time. ........ r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines Added an optional timeout parameter to function urllib2.urlopen, with tests in test_urllib2net.py (must have network resource enabled to execute them). Also modified test_urllib2.py because testing mock classes must take it into acount. Docs are also updated. ........ r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration. ........ r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines Disallow function calls like foo(None=1). Backport from py3k rev. 55708 by Guido. ........ r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines Make reindent.py executable. ........ r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines Patch #1667860: Fix UnboundLocalError in urllib2. ........ r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line Fixing changes to getbuildinfo.c that broke linux builds ........ r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line Make this test work with older Python releases where struct has no 't' format character. ........ r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines Bug #1733488: Fix compilation of bufferobject.c on AIX. Will backport to 2.5. ........ r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur with small modifications. ........ r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls. ........ r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines Fix wrong documentation, and correct the punktuation. Closes [1700455]. ........ r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line Fix warnings by using proper function prototype. ........ r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines Prevent expandtabs() on string and unicode objects from causing a segfault when a large width is passed on 32-bit platforms. Found by Google. It would be good for people to review this especially carefully and verify I don't have an off by one error and there is no other way to cause overflow. ........ r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error. ........ r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines Patch #1733960: Allow T_LONGLONG to accept ints. Will backport to 2.5. ........ r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines Fix Windows build. ........ r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines Provide LLONG_MAX for S390. ........ r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines First version of build scripts for Windows/AMD64 (no external components are built yet, and 'kill_python' is disabled). ........ r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter modules in the ReleaseAMD64 configuration because they do not compile. ........ r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line Need to set the environment variables, otherwise devenv.com is not found. ........ r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line Revert commit 55855. ........ ................ r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines Fix the refleak counter on test_collections. The ABC metaclass creates a registry which must be cleared on each run. Otherwise, there *seem* to be refleaks when there really aren't any. (The class is held within the registry even though it's no longer needed.) ................ r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line These tests have been removed, so they are no longer needed here ................ r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines Optimize access to True and False in the compiler (if True) and the peepholer (LOAD_NAME True). ................ r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines Remove __oct__ and __hex__ and use __index__ for converting non-ints before formatting in a base. Add a bin() builtin. ................ r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines int(x, 0) does not "guess". ................ r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines Add a comment to explain that nb_oct and nb_hex are nonfunctional. ................ r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines Get rid of unused imports and comment. ................ r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines _Abstract.__new__ now requires either no arguments or __init__ overridden. ................ r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines Move the collections ABCs to a separate file, _abcoll.py, in order to avoid needing to import _collections.so during the bootstrap (this will become apparent in the next submit of os.py). Add (plain and mutable) ABCs for Set, Mapping, Sequence. ................ r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines Rewrite the _Environ class to use the new collections ABCs. ................ r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines Merged revisions 55869-55912 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line Add Atul Varma for patch # 1667860 ........ r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line Ignore valgrind problems on Ubuntu from ld ........ r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines Ignore config.status.lineno which seems new (new autoconf?) ........ r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line Prevent these tests from running on Win64 since they don\'t apply there either ........ r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines Fix a bug when there was a newline in the string expandtabs was called on. This also catches another condition that can overflow. Will backport. ........ r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line Prevent hang if the port cannot be opened. ........ r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines Add all of the distuils modules that don't seem to have explicit tests. :-( Move an import in mworkscompiler so that this module can be imported on any platform. Hopefully this works on all platforms. ........ r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines SF #1734732, lower case the module names per PEP 8. Will backport. ........ r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines Not sure why this only fails sometimes on Unix machines. Better to disable it and only import msvccompiler on Windows since that's the only place it can work anyways. ........ r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute. Will backport ........ r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line Reflow long line ........ r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k" or "K" codes. ........ r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines Added versionchanged flag to all the methods which received a new optional timeout parameter, and a versionadded flag to the socket.create_connection function. ........ ................ r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines New super() implementation, for PEP 3135 (though the PEP is not yet updated to this design, and small tweaks may still be made later). ................ r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines I'm guessing this module broke when Neal ripped out the types module -- it used 'list' both as a local variable and as the built-in list type. Renamed the local variable since that was easier. ................ r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines Change all occurrences of super(<thisclass>, <firstarg>) to super(). Seems to have worked, all the tests still pass. Exception: test_descr and test_descrtut, which have tons of these and are there to test the various usages. ................ r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line Patch #1735485: remove StandardError from the exception hierarchy. ................ r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines Merged revisions 55913-55950 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines Apply patch #1734945 to support TurboLinux as distribution. ........ r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines Add patch #1726668: Windows Vista support. ........ r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line Checkout, but do not yet try to build, exernal sources. ........ r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines Add bufferoverflowU.lib to the libraries needed by _ssl (is this the right thing to do?). Set the /XP64 /RETAIL build enviroment in the makefile when building ReleaseAMD64. ........ r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines Revert this change, since it breaks the win32 build: Add bufferoverflowU.lib to the libraries needed by _ssl (is this the right thing to do?). ........ r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines Specify the bufferoverflowU.lib to the makefile on the command line (for ReleaseAMD64 builds). ........ r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj. Build sqlite3.dll and bsddb. ........ r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines Don't rebuild Berkeley DB if not needed (this was committed by accident). ........ r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines Provide PY_LLONG_MAX on all systems having long long. Will backport to 2.5. ........ ................ r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines Fix a compilation warning. ................

author	Guido van Rossum <guido@python.org>
date	Wed, 13 Jun 2007 18:07:49 +0000
parents	654c380cf8b9
children	a5e984eda45a

rev	line source
1198 2937897a7d8b * Added Fixcprt.py: script to fix copyright message. Guido van Rossum <guido@python.org> parents: 1186 diff changeset	1
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	2 /* Thread package.
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	3 This is intended to be usable independently from Python.
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	4 The implementation for system foobar is in a file thread_foobar.h
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	5 which is included by this file dependent on config settings.
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	6 Stuff shared by all thread_.h files is collected here. /
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	7
21712 c64fc56f6072 Include <unistd.h> in Python.h. Fixes #500924. Martin v. Löwis <martin@v.loewis.de> parents: 20468 diff changeset	8 #include "Python.h"
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	9
33145 28a205ecb4dd The attached patch fixes FTBFS on GNU/kBSD. The problem happens on GNU/kBSD Matthias Klose <doko@ubuntu.com> parents: 31504 diff changeset	10
28a205ecb4dd The attached patch fixes FTBFS on GNU/kBSD. The problem happens on GNU/kBSD Matthias Klose <doko@ubuntu.com> parents: 31504 diff changeset	11 #ifndef _POSIX_THREADS
28a205ecb4dd The attached patch fixes FTBFS on GNU/kBSD. The problem happens on GNU/kBSD Matthias Klose <doko@ubuntu.com> parents: 31504 diff changeset	12 /* This means pthreads are not implemented in libc headers, hence the macro
28a205ecb4dd The attached patch fixes FTBFS on GNU/kBSD. The problem happens on GNU/kBSD Matthias Klose <doko@ubuntu.com> parents: 31504 diff changeset	13 not present in unistd.h. But they still can be implemented as an external
28a205ecb4dd The attached patch fixes FTBFS on GNU/kBSD. The problem happens on GNU/kBSD Matthias Klose <doko@ubuntu.com> parents: 31504 diff changeset	14 library (e.g. gnu pth in pthread emulation) */
28a205ecb4dd The attached patch fixes FTBFS on GNU/kBSD. The problem happens on GNU/kBSD Matthias Klose <doko@ubuntu.com> parents: 31504 diff changeset	15 # ifdef HAVE_PTHREAD_H
28a205ecb4dd The attached patch fixes FTBFS on GNU/kBSD. The problem happens on GNU/kBSD Matthias Klose <doko@ubuntu.com> parents: 31504 diff changeset	16 # include <pthread.h> /* _POSIX_THREADS */
28a205ecb4dd The attached patch fixes FTBFS on GNU/kBSD. The problem happens on GNU/kBSD Matthias Klose <doko@ubuntu.com> parents: 31504 diff changeset	17 # endif
28a205ecb4dd The attached patch fixes FTBFS on GNU/kBSD. The problem happens on GNU/kBSD Matthias Klose <doko@ubuntu.com> parents: 31504 diff changeset	18 #endif
28a205ecb4dd The attached patch fixes FTBFS on GNU/kBSD. The problem happens on GNU/kBSD Matthias Klose <doko@ubuntu.com> parents: 31504 diff changeset	19
10530 d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form Guido van Rossum <guido@python.org> parents: 9679 diff changeset	20 #ifndef DONT_HAVE_STDIO_H
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	21 #include <stdio.h>
10530 d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form Guido van Rossum <guido@python.org> parents: 9679 diff changeset	22 #endif
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	23
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	24 #include <stdlib.h>
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	25
5381 339d4129d3f7 Ugly hack for SGI IRIX 6.2. Apparently _POSIX_THREADS is defined even Guido van Rossum <guido@python.org> parents: 4839 diff changeset	26 #ifdef __sgi
339d4129d3f7 Ugly hack for SGI IRIX 6.2. Apparently _POSIX_THREADS is defined even Guido van Rossum <guido@python.org> parents: 4839 diff changeset	27 #ifndef HAVE_PTHREAD_H /* XXX Need to check in configure.in */
339d4129d3f7 Ugly hack for SGI IRIX 6.2. Apparently _POSIX_THREADS is defined even Guido van Rossum <guido@python.org> parents: 4839 diff changeset	28 #undef _POSIX_THREADS
339d4129d3f7 Ugly hack for SGI IRIX 6.2. Apparently _POSIX_THREADS is defined even Guido van Rossum <guido@python.org> parents: 4839 diff changeset	29 #endif
339d4129d3f7 Ugly hack for SGI IRIX 6.2. Apparently _POSIX_THREADS is defined even Guido van Rossum <guido@python.org> parents: 4839 diff changeset	30 #endif
339d4129d3f7 Ugly hack for SGI IRIX 6.2. Apparently _POSIX_THREADS is defined even Guido van Rossum <guido@python.org> parents: 4839 diff changeset	31
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 8822 diff changeset	32 #include "pythread.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	33
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	34 #ifndef _POSIX_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	35
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	36 #ifdef __sgi
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	37 #define SGI_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	38 #endif
961 a31e07847063 New thread.c from Sjoerd, supports _exit_prog(). Use this in goaway() Guido van Rossum <guido@python.org> parents: 926 diff changeset	39
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	40 #ifdef HAVE_THREAD_H
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	41 #define SOLARIS_THREADS
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	42 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	43
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	44 #if defined(sun) && !defined(SOLARIS_THREADS)
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	45 #define SUN_LWP
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	46 #endif
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	47
35549 b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	48 /* Check if we're running on HP-UX and _SC_THREADS is defined. If so, then
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	49 enough of the Posix threads package is implimented to support python
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	50 threads.
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	51
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	52 This is valid for HP-UX 11.23 running on an ia64 system. If needed, add
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	53 a check of __ia64 to verify that we're running on a ia64 system instead
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	54 of a pa-risc system.
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	55 */
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	56 #ifdef __hpux
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	57 #ifdef _SC_THREADS
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	58 #define _POSIX_THREADS
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	59 #endif
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	60 #endif
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	61
1418 b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	62 #endif /* _POSIX_THREADS */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	63
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	64
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4596 diff changeset	65 #ifdef Py_DEBUG
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	66 static int thread_debug = 0;
23992 95da99187c57 Silence compiler warning Jeremy Hylton <jeremy@alum.mit.edu> parents: 23777 diff changeset	67 #define dprintf(args) (void)((thread_debug & 1) && printf args)
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	68 #define d2printf(args) ((thread_debug & 8) && printf args)
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	69 #else
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	70 #define dprintf(args)
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	71 #define d2printf(args)
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	72 #endif
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	73
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	74 static int initialized;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	75
13689 9db86b27278f Prototype yet another forward declaration. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	76 static void PyThread__init_thread(void); /* Forward */
1004 5d7142ea01b7 adapted SV module to the new svideo library. Sjoerd Mullender <sjoerd@acm.org> parents: 961 diff changeset	77
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 35549 diff changeset	78 void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 35549 diff changeset	79 PyThread_init_thread(void)
1004 5d7142ea01b7 adapted SV module to the new svideo library. Sjoerd Mullender <sjoerd@acm.org> parents: 961 diff changeset	80 {
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4596 diff changeset	81 #ifdef Py_DEBUG
1418 b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	82 char *p = getenv("THREADDEBUG");
b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	83
b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	84 if (p) {
b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	85 if (*p)
b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	86 thread_debug = atoi(p);
b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	87 else
b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	88 thread_debug = 1;
b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	89 }
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4596 diff changeset	90 #endif /* Py_DEBUG */
1004 5d7142ea01b7 adapted SV module to the new svideo library. Sjoerd Mullender <sjoerd@acm.org> parents: 961 diff changeset	91 if (initialized)
5d7142ea01b7 adapted SV module to the new svideo library. Sjoerd Mullender <sjoerd@acm.org> parents: 961 diff changeset	92 return;
5d7142ea01b7 adapted SV module to the new svideo library. Sjoerd Mullender <sjoerd@acm.org> parents: 961 diff changeset	93 initialized = 1;
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9589 diff changeset	94 dprintf(("PyThread_init_thread called\n"));
877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9589 diff changeset	95 PyThread__init_thread();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	96 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	97
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	98 /* Support for runtime thread stack size tuning.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	99 A value of 0 means using the platform's default stack size
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	100 or the size specified by the THREAD_STACK_SIZE macro. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	101 static size_t _pythread_stacksize = 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	102
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	103 #ifdef SGI_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	104 #include "thread_sgi.h"
1418 b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	105 #endif
961 a31e07847063 New thread.c from Sjoerd, supports _exit_prog(). Use this in goaway() Guido van Rossum <guido@python.org> parents: 926 diff changeset	106
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	107 #ifdef SOLARIS_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	108 #include "thread_solaris.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	109 #endif
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	110
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	111 #ifdef SUN_LWP
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	112 #include "thread_lwp.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	113 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	114
14674 756c8c6535fe Make better use of GNU Pth -- patch by Andy Dustman. Guido van Rossum <guido@python.org> parents: 14375 diff changeset	115 #ifdef HAVE_PTH
12611 b320cf3a98b9 Andy Dustman: add GNU pth user-space thread support. Guido van Rossum <guido@python.org> parents: 12475 diff changeset	116 #include "thread_pth.h"
30466 1a817694ecbd Patch #805613: Fix usage of the PTH library. Martin v. Löwis <martin@v.loewis.de> parents: 28694 diff changeset	117 #undef _POSIX_THREADS
14674 756c8c6535fe Make better use of GNU Pth -- patch by Andy Dustman. Guido van Rossum <guido@python.org> parents: 14375 diff changeset	118 #endif
756c8c6535fe Make better use of GNU Pth -- patch by Andy Dustman. Guido van Rossum <guido@python.org> parents: 14375 diff changeset	119
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	120 #ifdef _POSIX_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	121 #include "thread_pthread.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	122 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	123
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	124 #ifdef C_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	125 #include "thread_cthread.h"
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	126 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	127
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	128 #ifdef NT_THREADS
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	129 #include "thread_nt.h"
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	130 #endif
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	131
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	132 #ifdef OS2_THREADS
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	133 #include "thread_os2.h"
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	134 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	135
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	136 #ifdef BEOS_THREADS
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	137 #include "thread_beos.h"
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	138 #endif
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	139
10530 d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form Guido van Rossum <guido@python.org> parents: 9679 diff changeset	140 #ifdef WINCE_THREADS
d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form Guido van Rossum <guido@python.org> parents: 9679 diff changeset	141 #include "thread_wince.h"
d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form Guido van Rossum <guido@python.org> parents: 9679 diff changeset	142 #endif
d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form Guido van Rossum <guido@python.org> parents: 9679 diff changeset	143
22206 b898c0feb754 Patch #504224: add plan9 threads include to thread.c. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	144 #ifdef PLAN9_THREADS
b898c0feb754 Patch #504224: add plan9 threads include to thread.c. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	145 #include "thread_plan9.h"
b898c0feb754 Patch #504224: add plan9 threads include to thread.c. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	146 #endif
b898c0feb754 Patch #504224: add plan9 threads include to thread.c. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	147
23777 bec1b942e0bc Patch #488073: AtheOS port. Martin v. Löwis <martin@v.loewis.de> parents: 22509 diff changeset	148 #ifdef ATHEOS_THREADS
bec1b942e0bc Patch #488073: AtheOS port. Martin v. Löwis <martin@v.loewis.de> parents: 22509 diff changeset	149 #include "thread_atheos.h"
bec1b942e0bc Patch #488073: AtheOS port. Martin v. Löwis <martin@v.loewis.de> parents: 22509 diff changeset	150 #endif
bec1b942e0bc Patch #488073: AtheOS port. Martin v. Löwis <martin@v.loewis.de> parents: 22509 diff changeset	151
961 a31e07847063 New thread.c from Sjoerd, supports _exit_prog(). Use this in goaway() Guido van Rossum <guido@python.org> parents: 926 diff changeset	152 /*
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	153 #ifdef FOOBAR_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	154 #include "thread_foobar.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	155 #endif
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	156 */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	157
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	158 /* return the current thread stack size */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	159 size_t
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	160 PyThread_get_stacksize(void)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	161 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	162 return _pythread_stacksize;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	163 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	164
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	165 /* Only platforms defining a THREAD_SET_STACKSIZE() macro
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	166 in thread_<platform>.h support changing the stack size.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	167 Return 0 if stack size is valid,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	168 -1 if stack size value is invalid,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	169 -2 if setting stack size is not supported. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	170 int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	171 PyThread_set_stacksize(size_t size)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	172 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	173 #if defined(THREAD_SET_STACKSIZE)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	174 return THREAD_SET_STACKSIZE(size);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	175 #else
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	176 return -2;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	177 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	178 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	179
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	180 #ifndef Py_HAVE_NATIVE_TLS
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	181 /* If the platform has not supplied a platform specific
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	182 TLS implementation, provide our own.
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	183
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	184 This code stolen from "thread_sgi.h", where it was the only
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	185 implementation of an existing Python TLS API.
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	186 */
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	187 /* ------------------------------------------------------------------------
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	188 Per-thread data ("key") support.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	189
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	190 Use PyThread_create_key() to create a new key. This is typically shared
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	191 across threads.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	192
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	193 Use PyThread_set_key_value(thekey, value) to associate void* value with
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	194 thekey in the current thread. Each thread has a distinct mapping of thekey
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	195 to a void* value. Caution: if the current thread already has a mapping
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	196 for thekey, value is ignored.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	197
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	198 Use PyThread_get_key_value(thekey) to retrieve the void* value associated
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	199 with thekey in the current thread. This returns NULL if no value is
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	200 associated with thekey in the current thread.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	201
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	202 Use PyThread_delete_key_value(thekey) to forget the current thread's associated
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	203 value for thekey. PyThread_delete_key(thekey) forgets the values associated
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	204 with thekey across all threads.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	205
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	206 While some of these functions have error-return values, none set any
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	207 Python exception.
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	208
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	209 None of the functions does memory management on behalf of the void* values.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	210 You need to allocate and deallocate them yourself. If the void* values
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	211 happen to be PyObject*, these functions don't do refcount operations on
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	212 them either.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	213
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	214 The GIL does not need to be held when calling these functions; they supply
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	215 their own locking. This isn't true of PyThread_create_key(), though (see
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	216 next paragraph).
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	217
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	218 There's a hidden assumption that PyThread_create_key() will be called before
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	219 any of the other functions are called. There's also a hidden assumption
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	220 that calls to PyThread_create_key() are serialized externally.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	221 ------------------------------------------------------------------------ */
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	222
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	223 /* A singly-linked list of struct key objects remembers all the key->value
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	224 * associations. File static keyhead heads the list. keymutex is used
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	225 * to enforce exclusion internally.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	226 */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	227 struct key {
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	228 /* Next record in the list, or NULL if this is the last record. */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	229 struct key *next;
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	230
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	231 /* The thread id, according to PyThread_get_thread_ident(). */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	232 long id;
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	233
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	234 /* The key and its associated value. */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	235 int key;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	236 void *value;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	237 };
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	238
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	239 static struct key *keyhead = NULL;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	240 static PyThread_type_lock keymutex = NULL;
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	241 static int nkeys = 0; /* PyThread_create_key() hands out nkeys+1 next */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	242
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	243 /* Internal helper.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	244 * If the current thread has a mapping for key, the appropriate struct key*
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	245 * is returned. NB: value is ignored in this case!
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	246 * If there is no mapping for key in the current thread, then:
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	247 * If value is NULL, NULL is returned.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	248 * Else a mapping of key to value is created for the current thread,
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	249 * and a pointer to a new struct key* is returned; except that if
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	250 * malloc() can't find room for a new struct key*, NULL is returned.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	251 * So when value==NULL, this acts like a pure lookup routine, and when
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	252 * value!=NULL, this acts like dict.setdefault(), returning an existing
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	253 * mapping if one exists, else creating a new mapping.
33712 baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	254 *
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	255 * Caution: this used to be too clever, trying to hold keymutex only
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	256 * around the "p->next = keyhead; keyhead = p" pair. That allowed
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	257 * another thread to mutate the list, via key deletion, concurrent with
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	258 * find_key() crawling over the list. Hilarity ensued. For example, when
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	259 * the for-loop here does "p = p->next", p could end up pointing at a
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	260 * record that PyThread_delete_key_value() was concurrently free()'ing.
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	261 * That could lead to anything, from failing to find a key that exists, to
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	262 * segfaults. Now we lock the whole routine.
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	263 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	264 static struct key *
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	265 find_key(int key, void *value)
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	266 {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	267 struct key *p;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	268 long id = PyThread_get_thread_ident();
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	269
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	270 if (!keymutex)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	271 return NULL;
33712 baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	272 PyThread_acquire_lock(keymutex, 1);
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	273 for (p = keyhead; p != NULL; p = p->next) {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	274 if (p->id == id && p->key == key)
33712 baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	275 goto Done;
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	276 }
33712 baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	277 if (value == NULL) {
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	278 assert(p == NULL);
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	279 goto Done;
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	280 }
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	281 p = (struct key *)malloc(sizeof(struct key));
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	282 if (p != NULL) {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	283 p->id = id;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	284 p->key = key;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	285 p->value = value;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	286 p->next = keyhead;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	287 keyhead = p;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	288 }
33712 baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	289 Done:
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	290 PyThread_release_lock(keymutex);
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	291 return p;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	292 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	293
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	294 /* Return a new key. This must be called before any other functions in
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	295 * this family, and callers must arrange to serialize calls to this
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	296 * function. No violations are detected.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	297 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	298 int
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	299 PyThread_create_key(void)
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	300 {
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	301 /* All parts of this function are wrong if it's called by multiple
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	302 * threads simultaneously.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	303 */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	304 if (keymutex == NULL)
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	305 keymutex = PyThread_allocate_lock();
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	306 return ++nkeys;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	307 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	308
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	309 /* Forget the associations for key across all threads. */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	310 void
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	311 PyThread_delete_key(int key)
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	312 {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	313 struct key p, *q;
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	314
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	315 PyThread_acquire_lock(keymutex, 1);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	316 q = &keyhead;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	317 while ((p = *q) != NULL) {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	318 if (p->key == key) {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	319 *q = p->next;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	320 free((void *)p);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	321 /* NB This does not free p->value! */
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	322 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	323 else
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	324 q = &p->next;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	325 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	326 PyThread_release_lock(keymutex);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	327 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	328
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	329 /* Confusing: If the current thread has an association for key,
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	330 * value is ignored, and 0 is returned. Else an attempt is made to create
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	331 * an association of key to value for the current thread. 0 is returned
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	332 * if that succeeds, but -1 is returned if there's not enough memory
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	333 * to create the association. value must not be NULL.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	334 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	335 int
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	336 PyThread_set_key_value(int key, void *value)
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	337 {
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	338 struct key *p;
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	339
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	340 assert(value != NULL);
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	341 p = find_key(key, value);
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	342 if (p == NULL)
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	343 return -1;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	344 else
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	345 return 0;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	346 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	347
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	348 /* Retrieve the value associated with key in the current thread, or NULL
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	349 * if the current thread doesn't have an association for key.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	350 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	351 void *
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	352 PyThread_get_key_value(int key)
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	353 {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	354 struct key *p = find_key(key, NULL);
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	355
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	356 if (p == NULL)
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	357 return NULL;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	358 else
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	359 return p->value;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	360 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	361
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	362 /* Forget the current thread's association for key, if any. */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	363 void
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	364 PyThread_delete_key_value(int key)
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	365 {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	366 long id = PyThread_get_thread_ident();
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	367 struct key p, *q;
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	368
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	369 PyThread_acquire_lock(keymutex, 1);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	370 q = &keyhead;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	371 while ((p = *q) != NULL) {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	372 if (p->key == key && p->id == id) {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	373 *q = p->next;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	374 free((void *)p);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	375 /* NB This does not free p->value! */
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	376 break;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	377 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	378 else
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	379 q = &p->next;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	380 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	381 PyThread_release_lock(keymutex);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	382 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	383
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	384 #endif /* Py_HAVE_NATIVE_TLS */

Mercurial > cpython-lru_cache-weakref

annotate Python/thread.c @ 42084:229c28cb9afb