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

annotate Python/thread.c @ 38673:a19c20c5e5c7

Merge the rest of the trunk. Merged revisions 46490-46494,46496,46498,46500,46506,46521,46538,46558,46563-46567,46570-46571,46583,46593,46595-46598,46604,46606,46609-46753 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r46610 | martin.v.loewis | 2006-06-03 09:42:26 +0200 (Sat, 03 Jun 2006) | 2 lines Updated version (win32-icons2.zip) from #1490384. ........ r46612 | andrew.kuchling | 2006-06-03 20:09:41 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1472084] Fix description of do_tag ........ r46614 | andrew.kuchling | 2006-06-03 20:33:35 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1475554] Strengthen text to say 'must' instead of 'should' ........ r46616 | andrew.kuchling | 2006-06-03 20:41:28 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1441864] Clarify description of 'data' argument ........ r46617 | andrew.kuchling | 2006-06-03 20:43:24 +0200 (Sat, 03 Jun 2006) | 1 line Minor rewording ........ r46619 | andrew.kuchling | 2006-06-03 21:02:35 +0200 (Sat, 03 Jun 2006) | 9 lines [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Fix by renaming the variable. In a different module, Neal fixed it by renaming _self to self. There's already a variable named 'self' here, so I used selfptr. (I'm committing this on a Mac without Tk, but it's a simple search-and-replace. <crosses fingers>, so I'll watch the buildbots and see what happens.) ........ r46621 | fredrik.lundh | 2006-06-03 23:56:05 +0200 (Sat, 03 Jun 2006) | 5 lines "_self" is a said to be a reserved word in Watcom C 10.6. I'm not sure that's really standard compliant behaviour, but I guess we have to fix that anyway... ........ r46622 | andrew.kuchling | 2006-06-04 00:44:42 +0200 (Sun, 04 Jun 2006) | 1 line Update readme ........ r46623 | andrew.kuchling | 2006-06-04 00:59:23 +0200 (Sun, 04 Jun 2006) | 1 line Drop 0 parameter ........ r46624 | andrew.kuchling | 2006-06-04 00:59:59 +0200 (Sun, 04 Jun 2006) | 1 line Some code tidying; use curses.wrapper ........ r46625 | andrew.kuchling | 2006-06-04 01:02:15 +0200 (Sun, 04 Jun 2006) | 1 line Use True; value returned from main is unused ........ r46626 | andrew.kuchling | 2006-06-04 01:07:21 +0200 (Sun, 04 Jun 2006) | 1 line Use true division, and the True value ........ r46627 | andrew.kuchling | 2006-06-04 01:09:58 +0200 (Sun, 04 Jun 2006) | 1 line Docstring fix; use True ........ r46628 | andrew.kuchling | 2006-06-04 01:15:56 +0200 (Sun, 04 Jun 2006) | 1 line Put code in a main() function; loosen up the spacing to match current code style ........ r46629 | andrew.kuchling | 2006-06-04 01:39:07 +0200 (Sun, 04 Jun 2006) | 1 line Use functions; modernize code ........ r46630 | andrew.kuchling | 2006-06-04 01:43:22 +0200 (Sun, 04 Jun 2006) | 1 line This demo requires Medusa (not just asyncore); remove it ........ r46631 | andrew.kuchling | 2006-06-04 01:46:36 +0200 (Sun, 04 Jun 2006) | 2 lines Remove xmlrpc demo -- it duplicates the SimpleXMLRPCServer module. ........ r46632 | andrew.kuchling | 2006-06-04 01:47:22 +0200 (Sun, 04 Jun 2006) | 1 line Remove xmlrpc/ directory ........ r46633 | andrew.kuchling | 2006-06-04 01:51:21 +0200 (Sun, 04 Jun 2006) | 1 line Remove dangling reference ........ r46634 | andrew.kuchling | 2006-06-04 01:59:36 +0200 (Sun, 04 Jun 2006) | 1 line Add more whitespace; use a better socket name ........ r46635 | tim.peters | 2006-06-04 03:22:53 +0200 (Sun, 04 Jun 2006) | 2 lines Whitespace normalization. ........ r46637 | tim.peters | 2006-06-04 05:26:02 +0200 (Sun, 04 Jun 2006) | 16 lines In a PYMALLOC_DEBUG build obmalloc adds extra debugging info to each allocated block. This was using 4 bytes for each such piece of info regardless of platform. This didn't really matter before (proof: no bug reports, and the debug-build obmalloc would have assert-failed if it was ever asked for a chunk of memory >= 2**32 bytes), since container indices were plain ints. But after the Py_ssize_t changes, it's at least theoretically possible to allocate a list or string whose guts exceed 2**32 bytes, and the PYMALLOC_DEBUG routines would fail then (having only 4 bytes to record the originally requested size). Now we use sizeof(size_t) bytes for each of a PYMALLOC_DEBUG build's extra debugging fields. This won't make any difference on 32-bit boxes, but will add 16 bytes to each allocation in a debug build on a 64-bit box. ........ r46638 | tim.peters | 2006-06-04 05:38:04 +0200 (Sun, 04 Jun 2006) | 4 lines _PyObject_DebugMalloc(): The return value should add 2*sizeof(size_t) now, not 8. This probably accounts for current disasters on the 64-bit buildbot slaves. ........ r46639 | neal.norwitz | 2006-06-04 08:19:31 +0200 (Sun, 04 Jun 2006) | 1 line SF #1499797, Fix for memory leak in WindowsError_str ........ r46640 | andrew.macintyre | 2006-06-04 14:31:09 +0200 (Sun, 04 Jun 2006) | 2 lines Patch #1454481: Make thread stack size runtime tunable. ........ r46641 | andrew.macintyre | 2006-06-04 14:59:59 +0200 (Sun, 04 Jun 2006) | 2 lines clean up function declarations to conform to PEP-7 style. ........ r46642 | martin.blais | 2006-06-04 15:49:49 +0200 (Sun, 04 Jun 2006) | 15 lines Fixes in struct and socket from merge reviews. - Following Guido's comments, renamed * pack_to -> pack_into * recv_buf -> recv_into * recvfrom_buf -> recvfrom_into - Made fixes to _struct.c according to Neal Norwitz comments on the checkins list. - Converted some ints into the appropriate -- I hope -- ssize_t and size_t. ........ r46643 | ronald.oussoren | 2006-06-04 16:05:28 +0200 (Sun, 04 Jun 2006) | 3 lines "Import" LDFLAGS in Mac/OSX/Makefile.in to ensure pythonw gets build with the right compiler flags. ........ r46644 | ronald.oussoren | 2006-06-04 16:24:59 +0200 (Sun, 04 Jun 2006) | 2 lines Drop Mac wrappers for the WASTE library. ........ r46645 | tim.peters | 2006-06-04 17:49:07 +0200 (Sun, 04 Jun 2006) | 3 lines s_methods[]: Stop compiler warnings by casting s_unpack_from to PyCFunction. ........ r46646 | george.yoshida | 2006-06-04 19:04:12 +0200 (Sun, 04 Jun 2006) | 2 lines Remove a redundant word ........ r46647 | george.yoshida | 2006-06-04 19:17:25 +0200 (Sun, 04 Jun 2006) | 2 lines Markup fix ........ r46648 | martin.v.loewis | 2006-06-04 21:36:28 +0200 (Sun, 04 Jun 2006) | 2 lines Patch #1359618: Speed-up charmap encoder. ........ r46649 | georg.brandl | 2006-06-04 23:46:16 +0200 (Sun, 04 Jun 2006) | 3 lines Repair refleaks in unicodeobject. ........ r46650 | georg.brandl | 2006-06-04 23:56:52 +0200 (Sun, 04 Jun 2006) | 4 lines Patch #1346214: correctly optimize away "if 0"-style stmts (thanks to Neal for review) ........ r46651 | georg.brandl | 2006-06-05 00:15:37 +0200 (Mon, 05 Jun 2006) | 2 lines Bug #1500293: fix memory leaks in _subprocess module. ........ r46654 | tim.peters | 2006-06-05 01:43:53 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46655 | tim.peters | 2006-06-05 01:52:47 +0200 (Mon, 05 Jun 2006) | 16 lines Revert revisions: 46640 Patch #1454481: Make thread stack size runtime tunable. 46647 Markup fix The first is causing many buildbots to fail test runs, and there are multiple causes with seemingly no immediate prospects for repairing them. See python-dev discussion. Note that a branch can (and should) be created for resolving these problems, like svn copy svn+ssh://svn.python.org/python/trunk -r46640 svn+ssh://svn.python.org/python/branches/NEW_BRANCH followed by merging rev 46647 to the new branch. ........ r46656 | andrew.kuchling | 2006-06-05 02:08:09 +0200 (Mon, 05 Jun 2006) | 1 line Mention second encoding speedup ........ r46657 | gregory.p.smith | 2006-06-05 02:31:01 +0200 (Mon, 05 Jun 2006) | 7 lines bugfix: when log_archive was called with the DB_ARCH_REMOVE flag present in BerkeleyDB >= 4.2 it tried to construct a list out of an uninitialized char **log_list. feature: export the DB_ARCH_REMOVE flag by name in the module on BerkeleyDB >= 4.2. ........ r46658 | gregory.p.smith | 2006-06-05 02:33:35 +0200 (Mon, 05 Jun 2006) | 5 lines fix a bug in the previous commit. don't leak empty list on error return and fix the additional rare (out of memory only) bug that it was supposed to fix of not freeing log_list when the python allocator failed. ........ r46660 | tim.peters | 2006-06-05 02:55:26 +0200 (Mon, 05 Jun 2006) | 9 lines "Flat is better than nested." Move the long-winded, multiply-nested -R support out of runtest() and into some module-level helper functions. This makes runtest() and the -R code easier to follow. That in turn allowed seeing some opportunities for code simplification, and made it obvious that reglog.txt never got closed. ........ r46661 | hyeshik.chang | 2006-06-05 02:59:54 +0200 (Mon, 05 Jun 2006) | 3 lines Fix a potentially invalid memory access of CJKCodecs' shift-jis decoder. (found by Neal Norwitz) ........ r46663 | gregory.p.smith | 2006-06-05 03:39:52 +0200 (Mon, 05 Jun 2006) | 3 lines * support DBEnv.log_stat() method on BerkeleyDB >= 4.0 [patch #1494885] ........ r46664 | tim.peters | 2006-06-05 03:43:03 +0200 (Mon, 05 Jun 2006) | 3 lines Remove doctest.testmod's deprecated (in 2.4) `isprivate` argument. A lot of hair went into supporting that! ........ r46665 | tim.peters | 2006-06-05 03:47:24 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46666 | tim.peters | 2006-06-05 03:48:21 +0200 (Mon, 05 Jun 2006) | 2 lines Make doctest news more accurate. ........ r46667 | gregory.p.smith | 2006-06-05 03:56:15 +0200 (Mon, 05 Jun 2006) | 3 lines * support DBEnv.lsn_reset() method on BerkeleyDB >= 4.4 [patch #1494902] ........ r46668 | gregory.p.smith | 2006-06-05 04:02:25 +0200 (Mon, 05 Jun 2006) | 3 lines mention the just committed bsddb changes ........ r46671 | gregory.p.smith | 2006-06-05 19:38:04 +0200 (Mon, 05 Jun 2006) | 3 lines * add support for DBSequence objects [patch #1466734] ........ r46672 | gregory.p.smith | 2006-06-05 20:20:07 +0200 (Mon, 05 Jun 2006) | 3 lines forgot to add this file in previous commit ........ r46673 | tim.peters | 2006-06-05 20:36:12 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46674 | tim.peters | 2006-06-05 20:36:54 +0200 (Mon, 05 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46675 | gregory.p.smith | 2006-06-05 20:48:21 +0200 (Mon, 05 Jun 2006) | 4 lines * fix DBCursor.pget() bug with keyword argument names when no data= is supplied [SF pybsddb bug #1477863] ........ r46676 | andrew.kuchling | 2006-06-05 21:05:32 +0200 (Mon, 05 Jun 2006) | 1 line Remove use of Trove name, which isn't very helpful to users ........ r46677 | andrew.kuchling | 2006-06-05 21:08:25 +0200 (Mon, 05 Jun 2006) | 1 line [Bug #1470026] Include link to list of classifiers ........ r46679 | tim.peters | 2006-06-05 22:48:49 +0200 (Mon, 05 Jun 2006) | 10 lines Access _struct attributes directly instead of mucking with getattr. string_reverse(): Simplify. assertRaises(): Raise TestFailed on failure. test_unpack_from(), test_pack_into(), test_pack_into_fn(): never use `assert` to test for an expected result (it doesn't test anything when Python is run with -O). ........ r46680 | tim.peters | 2006-06-05 22:49:27 +0200 (Mon, 05 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46681 | gregory.p.smith | 2006-06-06 01:38:06 +0200 (Tue, 06 Jun 2006) | 3 lines add depends = ['md5.h'] to the _md5 module extension for correctness sake. ........ r46682 | brett.cannon | 2006-06-06 01:51:55 +0200 (Tue, 06 Jun 2006) | 4 lines Add 3 more bytes to a buffer to cover constants in string and null byte on top of 10 possible digits for an int. Closes bug #1501223. ........ r46684 | gregory.p.smith | 2006-06-06 01:59:37 +0200 (Tue, 06 Jun 2006) | 5 lines - bsddb: the __len__ method of a DB object has been fixed to return correct results. It could previously incorrectly return 0 in some cases. Fixes SF bug 1493322 (pybsddb bug 1184012). ........ r46686 | tim.peters | 2006-06-06 02:25:07 +0200 (Tue, 06 Jun 2006) | 7 lines _PySys_Init(): It's rarely a good idea to size a buffer to the exact maximum size someone guesses is needed. In this case, if we're really worried about extreme integers, then "cp%d" can actually need 14 bytes (2 for "cp" + 1 for \0 at the end + 11 for -(2**31-1)). So reserve 128 bytes instead -- nothing is actually saved by making a stack-local buffer tiny. ........ r46687 | neal.norwitz | 2006-06-06 09:22:08 +0200 (Tue, 06 Jun 2006) | 1 line Remove unused variable (and stop compiler warning) ........ r46688 | neal.norwitz | 2006-06-06 09:23:01 +0200 (Tue, 06 Jun 2006) | 1 line Fix a bunch of parameter strings ........ r46689 | thomas.heller | 2006-06-06 13:34:33 +0200 (Tue, 06 Jun 2006) | 6 lines Convert CFieldObject tp_members to tp_getset, since there is no structmember typecode for Py_ssize_t fields. This should fix some of the errors on the PPC64 debian machine (64-bit, big endian). Assigning to readonly fields now raises AttributeError instead of TypeError, so the testcase has to be changed as well. ........ r46690 | thomas.heller | 2006-06-06 13:54:32 +0200 (Tue, 06 Jun 2006) | 1 line Damn - the sentinel was missing. And fix another silly mistake. ........ r46691 | martin.blais | 2006-06-06 14:46:55 +0200 (Tue, 06 Jun 2006) | 13 lines Normalized a few cases of whitespace in function declarations. Found them using:: find . -name '*.py' | while read i ; do grep 'def[^(]*( ' $i /dev/null ; done find . -name '*.py' | while read i ; do grep ' ):' $i /dev/null ; done (I was doing this all over my own code anyway, because I'd been using spaces in all defs, so I thought I'd make a run on the Python code as well. If you need to do such fixes in your own code, you can use xx-rename or parenregu.el within emacs.) ........ r46693 | thomas.heller | 2006-06-06 17:34:18 +0200 (Tue, 06 Jun 2006) | 1 line Specify argtypes for all test functions. Maybe that helps on strange ;-) architectures ........ r46694 | tim.peters | 2006-06-06 17:50:17 +0200 (Tue, 06 Jun 2006) | 5 lines BSequence_set_range(): Rev 46688 ("Fix a bunch of parameter strings") changed this function's signature seemingly by mistake, which is causing buildbots to fail test_bsddb3. Restored the pre-46688 signature. ........ r46695 | tim.peters | 2006-06-06 17:52:35 +0200 (Tue, 06 Jun 2006) | 4 lines On python-dev Thomas Heller said these were committed by mistake in rev 46693, so reverting this part of rev 46693. ........ r46696 | andrew.kuchling | 2006-06-06 19:10:41 +0200 (Tue, 06 Jun 2006) | 1 line Fix comment typo ........ r46697 | brett.cannon | 2006-06-06 20:08:16 +0200 (Tue, 06 Jun 2006) | 2 lines Fix coding style guide bug. ........ r46698 | thomas.heller | 2006-06-06 20:50:46 +0200 (Tue, 06 Jun 2006) | 2 lines Add a hack so that foreign functions returning float now do work on 64-bit big endian platforms. ........ r46699 | thomas.heller | 2006-06-06 21:25:13 +0200 (Tue, 06 Jun 2006) | 3 lines Use the same big-endian hack as in _ctypes/callproc.c for callback functions. This fixes the callback function tests that return float. ........ r46700 | ronald.oussoren | 2006-06-06 21:50:24 +0200 (Tue, 06 Jun 2006) | 5 lines * Ensure that "make altinstall" works when the tree was configured with --enable-framework * Also for --enable-framework: allow users to use --prefix to specify the location of the compatibility symlinks (such as /usr/local/bin/python) ........ r46701 | ronald.oussoren | 2006-06-06 21:56:00 +0200 (Tue, 06 Jun 2006) | 3 lines A quick hack to ensure the right key-bindings for IDLE on osx: install patched configuration files during a framework install. ........ r46702 | tim.peters | 2006-06-07 03:04:59 +0200 (Wed, 07 Jun 2006) | 4 lines dash_R_cleanup(): Clear filecmp._cache. This accounts for different results across -R runs (at least on Windows) of test_filecmp. ........ r46705 | tim.peters | 2006-06-07 08:57:51 +0200 (Wed, 07 Jun 2006) | 17 lines SF patch 1501987: Remove randomness from test_exceptions, from ?iga Seilnacht (sorry about the name, but Firefox on my box can't display the first character of the name -- the SF "Unix name" is zseil). This appears to cure the oddball intermittent leaks across runs when running test_exceptions under -R. I'm not sure why, but I'm too sleepy to care ;-) The thrust of the SF patch was to remove randomness in the pickle protocol used. I changed the patch to use range(pickle.HIGHEST_PROTOCOL + 1), to try both pickle and cPickle, and randomly mucked with other test lines to put statements on their own lines. Not a bugfix candidate (this is fiddling new-in-2.5 code). ........ r46706 | andrew.kuchling | 2006-06-07 15:55:33 +0200 (Wed, 07 Jun 2006) | 1 line Add an SQLite introduction, taken from the 'What's New' text ........ r46708 | andrew.kuchling | 2006-06-07 19:02:52 +0200 (Wed, 07 Jun 2006) | 1 line Mention other placeholders ........ r46709 | andrew.kuchling | 2006-06-07 19:03:46 +0200 (Wed, 07 Jun 2006) | 1 line Add an item; also, escape % ........ r46710 | andrew.kuchling | 2006-06-07 19:04:01 +0200 (Wed, 07 Jun 2006) | 1 line Mention other placeholders ........ r46716 | ronald.oussoren | 2006-06-07 20:57:44 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/Tools one level up ........ r46717 | ronald.oussoren | 2006-06-07 20:58:01 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/PythonLauncher one level up ........ r46718 | ronald.oussoren | 2006-06-07 20:58:42 +0200 (Wed, 07 Jun 2006) | 2 lines mv Mac/OSX/BuildScript one level up ........ r46719 | ronald.oussoren | 2006-06-07 21:02:03 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/* one level up ........ r46720 | ronald.oussoren | 2006-06-07 21:06:01 +0200 (Wed, 07 Jun 2006) | 2 lines And the last bit: move IDLE one level up and adjust makefiles ........ r46723 | ronald.oussoren | 2006-06-07 21:38:53 +0200 (Wed, 07 Jun 2006) | 4 lines - Patch the correct version of python in the Info.plists at build time, instead of relying on a maintainer to update them before releases. - Remove the now empty Mac/OSX directory ........ r46727 | ronald.oussoren | 2006-06-07 22:18:44 +0200 (Wed, 07 Jun 2006) | 7 lines * If BuildApplet.py is used as an applet it starts with a version of sys.exutable that isn't usuable on an #!-line. That results in generated applets that don't actually work. Work around this problem by resetting sys.executable. * argvemulator.py didn't work on intel macs. This patch fixes this (bug #1491468) ........ r46728 | tim.peters | 2006-06-07 22:40:06 +0200 (Wed, 07 Jun 2006) | 2 lines Whitespace normalization. ........ r46729 | tim.peters | 2006-06-07 22:40:54 +0200 (Wed, 07 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46730 | thomas.heller | 2006-06-07 22:43:06 +0200 (Wed, 07 Jun 2006) | 7 lines Fix for foreign functions returning small structures on 64-bit big endian machines. Should fix the remaininf failure in the PPC64 Debian buildbot. Thanks to Matthias Klose for providing access to a machine to debug and test this. ........ r46731 | brett.cannon | 2006-06-07 23:48:17 +0200 (Wed, 07 Jun 2006) | 2 lines Clarify documentation for bf_getcharbuffer. ........ r46735 | neal.norwitz | 2006-06-08 07:12:45 +0200 (Thu, 08 Jun 2006) | 1 line Fix a refleak in recvfrom_into ........ r46736 | gregory.p.smith | 2006-06-08 07:17:08 +0200 (Thu, 08 Jun 2006) | 9 lines - bsddb: the bsddb.dbtables Modify method now raises the proper error and aborts the db transaction safely when a modifier callback fails. Fixes SF python patch/bug #1408584. Also cleans up the bsddb.dbtables docstrings since thats the only documentation that exists for that unadvertised module. (people really should really just use sqlite3) ........ r46737 | gregory.p.smith | 2006-06-08 07:38:11 +0200 (Thu, 08 Jun 2006) | 4 lines * Turn the deadlock situation described in SF bug #775414 into a DBDeadLockError exception. * add the test case for my previous dbtables commit. ........ r46738 | gregory.p.smith | 2006-06-08 07:39:54 +0200 (Thu, 08 Jun 2006) | 2 lines pasted set_lk_detect line in wrong spot in previous commit. fixed. passes tests this time. ........ r46739 | armin.rigo | 2006-06-08 12:56:24 +0200 (Thu, 08 Jun 2006) | 6 lines (arre, arigo) SF bug #1350060 Give a consistent behavior for comparison and hashing of method objects (both user- and built-in methods). Now compares the 'self' recursively. The hash was already asking for the hash of 'self'. ........ r46740 | andrew.kuchling | 2006-06-08 13:56:44 +0200 (Thu, 08 Jun 2006) | 1 line Typo fix ........ r46741 | georg.brandl | 2006-06-08 14:45:01 +0200 (Thu, 08 Jun 2006) | 2 lines Bug #1502750: Fix getargs "i" format to use LONG_MIN and LONG_MAX for bounds checking. ........ r46743 | georg.brandl | 2006-06-08 14:54:13 +0200 (Thu, 08 Jun 2006) | 2 lines Bug #1502728: Correctly link against librt library on HP-UX. ........ r46745 | georg.brandl | 2006-06-08 14:55:47 +0200 (Thu, 08 Jun 2006) | 3 lines Add news for recent bugfix. ........ r46746 | georg.brandl | 2006-06-08 15:31:07 +0200 (Thu, 08 Jun 2006) | 4 lines Argh. "integer" is a very confusing word ;) Actually, checking for INT_MAX and INT_MIN is correct since the format code explicitly handles a C "int". ........ r46748 | nick.coghlan | 2006-06-08 15:54:49 +0200 (Thu, 08 Jun 2006) | 1 line Add functools.update_wrapper() and functools.wraps() as described in PEP 356 ........ r46751 | georg.brandl | 2006-06-08 16:50:21 +0200 (Thu, 08 Jun 2006) | 4 lines Bug #1502805: don't alias file.__exit__ to file.close since the latter can return something that's true. ........ r46752 | georg.brandl | 2006-06-08 16:50:53 +0200 (Thu, 08 Jun 2006) | 3 lines Convert test_file to unittest. ........

author	Thomas Wouters <thomas@python.org>
date	Thu, 08 Jun 2006 15:35:45 +0000
parents	b19cf73c54a7
children	654c380cf8b9

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
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	98 #ifdef SGI_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	99 #include "thread_sgi.h"
1418 b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	100 #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	101
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	102 #ifdef SOLARIS_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	103 #include "thread_solaris.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	104 #endif
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	105
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	106 #ifdef SUN_LWP
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	107 #include "thread_lwp.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	108 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	109
14674 756c8c6535fe Make better use of GNU Pth -- patch by Andy Dustman. Guido van Rossum <guido@python.org> parents: 14375 diff changeset	110 #ifdef HAVE_PTH
12611 b320cf3a98b9 Andy Dustman: add GNU pth user-space thread support. Guido van Rossum <guido@python.org> parents: 12475 diff changeset	111 #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	112 #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	113 #endif
756c8c6535fe Make better use of GNU Pth -- patch by Andy Dustman. Guido van Rossum <guido@python.org> parents: 14375 diff changeset	114
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	115 #ifdef _POSIX_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	116 #include "thread_pthread.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	117 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	118
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	119 #ifdef C_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	120 #include "thread_cthread.h"
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	121 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	122
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	123 #ifdef NT_THREADS
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	124 #include "thread_nt.h"
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	125 #endif
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	126
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	127 #ifdef OS2_THREADS
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	128 #include "thread_os2.h"
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	129 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	130
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	131 #ifdef BEOS_THREADS
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	132 #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	133 #endif
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	134
10530 d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form Guido van Rossum <guido@python.org> parents: 9679 diff changeset	135 #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	136 #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	137 #endif
d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form Guido van Rossum <guido@python.org> parents: 9679 diff changeset	138
22206 b898c0feb754 Patch #504224: add plan9 threads include to thread.c. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	139 #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	140 #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	141 #endif
b898c0feb754 Patch #504224: add plan9 threads include to thread.c. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	142
23777 bec1b942e0bc Patch #488073: AtheOS port. Martin v. Löwis <martin@v.loewis.de> parents: 22509 diff changeset	143 #ifdef ATHEOS_THREADS
bec1b942e0bc Patch #488073: AtheOS port. Martin v. Löwis <martin@v.loewis.de> parents: 22509 diff changeset	144 #include "thread_atheos.h"
bec1b942e0bc Patch #488073: AtheOS port. Martin v. Löwis <martin@v.loewis.de> parents: 22509 diff changeset	145 #endif
bec1b942e0bc Patch #488073: AtheOS port. Martin v. Löwis <martin@v.loewis.de> parents: 22509 diff changeset	146
961 a31e07847063 New thread.c from Sjoerd, supports _exit_prog(). Use this in goaway() Guido van Rossum <guido@python.org> parents: 926 diff changeset	147 /*
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	148 #ifdef FOOBAR_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	149 #include "thread_foobar.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	150 #endif
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	151 */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	152
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	153 #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	154 /* 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	155 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	156
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	157 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	158 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	159 */
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	160 /* ------------------------------------------------------------------------
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	161 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	162
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	163 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	164 across threads.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	165
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	166 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	167 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	168 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	169 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	170
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	171 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	172 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	173 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	174
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	175 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	176 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	177 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	178
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	179 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	180 Python exception.
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	181
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	182 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	183 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	184 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	185 them either.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	186
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	187 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	188 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	189 next paragraph).
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	190
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	191 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	192 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	193 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	194 ------------------------------------------------------------------------ */
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	195
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	196 /* 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	197 * 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	198 * 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	199 */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	200 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	201 /* 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	202 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	203
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	204 /* 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	205 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	206
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	207 /* 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	208 int key;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	209 void *value;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	210 };
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	211
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	212 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	213 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	214 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	215
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	216 /* Internal helper.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	217 * 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	218 * 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	219 * 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	220 * 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	221 * 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	222 * 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	223 * 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	224 * 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	225 * 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	226 * 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	227 *
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	228 * 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	229 * 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	230 * 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	231 * 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	232 * 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	233 * 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	234 * 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	235 * 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	236 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	237 static struct key *
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	238 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	239 {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	240 struct key *p;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	241 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	242
33712 baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	243 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	244 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	245 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	246 goto Done;
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	247 }
33712 baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	248 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	249 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	250 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	251 }
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	252 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	253 if (p != NULL) {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	254 p->id = id;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	255 p->key = key;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	256 p->value = value;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	257 p->next = keyhead;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	258 keyhead = p;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	259 }
33712 baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	260 Done:
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	261 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	262 return p;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	263 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	264
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	265 /* 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	266 * 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	267 * 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	268 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	269 int
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	270 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	271 {
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	272 /* 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	273 * threads simultaneously.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	274 */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	275 if (keymutex == NULL)
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	276 keymutex = PyThread_allocate_lock();
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	277 return ++nkeys;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	278 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	279
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	280 /* 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	281 void
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	282 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	283 {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	284 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	285
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	286 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	287 q = &keyhead;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	288 while ((p = *q) != NULL) {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	289 if (p->key == key) {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	290 *q = p->next;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	291 free((void *)p);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	292 /* 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	293 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	294 else
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	295 q = &p->next;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	296 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	297 PyThread_release_lock(keymutex);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	298 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	299
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	300 /* 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	301 * 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	302 * 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	303 * 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	304 * 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	305 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	306 int
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	307 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	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 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	310
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	311 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	312 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	313 if (p == NULL)
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	314 return -1;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	315 else
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	316 return 0;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	317 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	318
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	319 /* 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	320 * 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	321 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	322 void *
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	323 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	324 {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	325 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	326
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	327 if (p == NULL)
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	328 return NULL;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	329 else
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	330 return p->value;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	331 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	332
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	333 /* 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	334 void
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	335 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	336 {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	337 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	338 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	339
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	340 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	341 q = &keyhead;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	342 while ((p = *q) != NULL) {
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	343 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	344 *q = p->next;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	345 free((void *)p);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	346 /* 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	347 break;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	348 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	349 else
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	350 q = &p->next;
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	351 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	352 PyThread_release_lock(keymutex);
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
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	355 #endif /* Py_HAVE_NATIVE_TLS */

Mercurial > cpython-lru_cache-weakref

annotate Python/thread.c @ 38673:a19c20c5e5c7