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

annotate Python/thread.c @ 65483:244cbcb67dcd

compiler_error(): use PyUnicode_DecodeFSDefault() to decode the filename, instead of utf-8 in strict mode.

author	Victor Stinner <victor.stinner@haypocalc.com>
date	Sun, 17 Oct 2010 19:16:33 +0000
parents	cab14be0ada1
children	3c9232a684ae

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
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 8822 diff changeset	26 #include "pythread.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	27
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	28 #ifndef _POSIX_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	29
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	30 #ifdef __sgi
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	31 #define SGI_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	32 #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	33
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	34 #ifdef HAVE_THREAD_H
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	35 #define SOLARIS_THREADS
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	36 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	37
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	38 #if defined(sun) && !defined(SOLARIS_THREADS)
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	39 #define SUN_LWP
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	40 #endif
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	41
35549 b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	42 /* Check if we're running on HP-UX and _SC_THREADS is defined. If so, then
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	43 enough of the Posix threads package is implimented to support python
35549 b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	44 threads.
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	45
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	46 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	47 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	48 of a pa-risc system.
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	49 */
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	50 #ifdef __hpux
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	51 #ifdef _SC_THREADS
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	52 #define _POSIX_THREADS
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	53 #endif
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	54 #endif
b19cf73c54a7 (backport from HEAD) Guido van Rossum <guido@python.org> parents: 33712 diff changeset	55
1418 b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	56 #endif /* _POSIX_THREADS */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	57
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	58
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4596 diff changeset	59 #ifdef Py_DEBUG
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	60 static int thread_debug = 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	61 #define dprintf(args) (void)((thread_debug & 1) && printf args)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	62 #define d2printf(args) ((thread_debug & 8) && printf args)
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	63 #else
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	64 #define dprintf(args)
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	65 #define d2printf(args)
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	66 #endif
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	67
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	68 static int initialized;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	69
13689 9db86b27278f Prototype yet another forward declaration. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	70 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	71
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 35549 diff changeset	72 void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 35549 diff changeset	73 PyThread_init_thread(void)
1004 5d7142ea01b7 adapted SV module to the new svideo library. Sjoerd Mullender <sjoerd@acm.org> parents: 961 diff changeset	74 {
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4596 diff changeset	75 #ifdef Py_DEBUG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	76 char *p = Py_GETENV("PYTHONTHREADDEBUG");
1418 b1bb74a2b593 Port to Solaris 2.3. Sjoerd Mullender <sjoerd@acm.org> parents: 1350 diff changeset	77
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	78 if (p) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	79 if (*p)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	80 thread_debug = atoi(p);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	81 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	82 thread_debug = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	83 }
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4596 diff changeset	84 #endif /* Py_DEBUG */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	85 if (initialized)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	86 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	87 initialized = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	88 dprintf(("PyThread_init_thread called\n"));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	89 PyThread__init_thread();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	90 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	91
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	92 /* Support for runtime thread stack size tuning.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	93 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	94 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	95 static size_t _pythread_stacksize = 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	96
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	97 #ifdef SGI_THREADS
56730 6ca642d4f42f Disable support for Irix threads Antoine Pitrou <solipsis@pitrou.net> parents: 56729 diff changeset	98 #error SGI Irix threads are now unsupported, and code will be removed in 3.3.
1848 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
56728 0c1238cabe92 Disable support for SunOS LWP Antoine Pitrou <solipsis@pitrou.net> parents: 56727 diff changeset	107 #error SunOS lightweight processes are now unsupported, and code will be removed in 3.3.
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	108 #include "thread_lwp.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	109 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	110
14674 756c8c6535fe Make better use of GNU Pth -- patch by Andy Dustman. Guido van Rossum <guido@python.org> parents: 14375 diff changeset	111 #ifdef HAVE_PTH
56729 f5c563a7de75 Disable GNU pth support Antoine Pitrou <solipsis@pitrou.net> parents: 56728 diff changeset	112 #error GNU pth threads are now unsupported, and code will be removed in 3.3.
12611 b320cf3a98b9 Andy Dustman: add GNU pth user-space thread support. Guido van Rossum <guido@python.org> parents: 12475 diff changeset	113 #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	114 #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	115 #endif
756c8c6535fe Make better use of GNU Pth -- patch by Andy Dustman. Guido van Rossum <guido@python.org> parents: 14375 diff changeset	116
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	117 #ifdef _POSIX_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	118 #include "thread_pthread.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	119 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	120
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	121 #ifdef C_THREADS
56727 b54da5caab36 Disable support for Mach C Threads. Antoine Pitrou <solipsis@pitrou.net> parents: 56726 diff changeset	122 #error Mach C Threads are now unsupported, and code will be removed in 3.3.
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	123 #include "thread_cthread.h"
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	124 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	125
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	126 #ifdef NT_THREADS
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	127 #include "thread_nt.h"
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	128 #endif
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: 2062 diff changeset	129
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	130 #ifdef OS2_THREADS
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	131 #include "thread_os2.h"
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	132 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 5599 diff changeset	133
22206 b898c0feb754 Patch #504224: add plan9 threads include to thread.c. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	134 #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	135 #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	136 #endif
b898c0feb754 Patch #504224: add plan9 threads include to thread.c. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	137
961 a31e07847063 New thread.c from Sjoerd, supports _exit_prog(). Use this in goaway() Guido van Rossum <guido@python.org> parents: 926 diff changeset	138 /*
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	139 #ifdef FOOBAR_THREADS
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	140 #include "thread_foobar.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	141 #endif
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	142 */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	143
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	144 /* return the current thread stack size */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	145 size_t
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	146 PyThread_get_stacksize(void)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	147 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	148 return _pythread_stacksize;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	149 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	150
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	151 /* 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	152 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	153 Return 0 if stack size is valid,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	154 -1 if stack size value is invalid,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	155 -2 if setting stack size is not supported. */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	156 int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	157 PyThread_set_stacksize(size_t size)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	158 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	159 #if defined(THREAD_SET_STACKSIZE)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	160 return THREAD_SET_STACKSIZE(size);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	161 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	162 return -2;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	163 #endif
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
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	166 #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	167 /* 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	168 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	169
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	170 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	171 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	172 */
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	173 /* ------------------------------------------------------------------------
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	174 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	175
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	176 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	177 across 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 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	180 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	181 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	182 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	183
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	184 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	185 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	186 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	187
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	188 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	189 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	190 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	191
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	192 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	193 Python exception.
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	194
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	195 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	196 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	197 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	198 them either.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	199
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	200 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	201 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	202 next paragraph).
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 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	205 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	206 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	207 ------------------------------------------------------------------------ */
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	208
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	209 /* 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	210 * 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	211 * 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	212 */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	213 struct key {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	214 /* Next record in the list, or NULL if this is the last record. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	215 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	216
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	217 /* The thread id, according to PyThread_get_thread_ident(). */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	218 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	219
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	220 /* The key and its associated value. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	221 int key;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	222 void *value;
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	223 };
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	224
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	225 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	226 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	227 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	228
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	229 /* Internal helper.
891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	230 * 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	231 * 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	232 * 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	233 * 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	234 * 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	235 * 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	236 * 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	237 * 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	238 * 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	239 * 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	240 *
baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	241 * 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	242 * 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	243 * 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	244 * 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	245 * 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	246 * 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	247 * 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	248 * 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	249 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	250 static struct key *
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	251 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	252 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	253 struct key p, prev_p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	254 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	255
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	256 if (!keymutex)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	257 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	258 PyThread_acquire_lock(keymutex, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	259 prev_p = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	260 for (p = keyhead; p != NULL; p = p->next) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	261 if (p->id == id && p->key == key)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	262 goto Done;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	263 /* Sanity check. These states should never happen but if
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	264 * they do we must abort. Otherwise we'll end up spinning in
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	265 * in a tight loop with the lock held. A similar check is done
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	266 * in pystate.c tstate_delete_common(). */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	267 if (p == prev_p)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	268 Py_FatalError("tls find_key: small circular list(!)");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	269 prev_p = p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	270 if (p->next == keyhead)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	271 Py_FatalError("tls find_key: circular list(!)");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	272 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	273 if (value == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	274 assert(p == NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	275 goto Done;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	276 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	277 p = (struct key *)malloc(sizeof(struct key));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	278 if (p != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	279 p->id = id;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	280 p->key = key;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	281 p->value = value;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	282 p->next = keyhead;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	283 keyhead = p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	284 }
33712 baa2653f7a76 find_key(): This routine wasn't thread-correct, and accounts for the Tim Peters <tim.peters@gmail.com> parents: 33705 diff changeset	285 Done:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	286 PyThread_release_lock(keymutex);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	287 return p;
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	288 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	289
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	290 /* 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	291 * 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	292 * 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	293 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	294 int
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	295 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	296 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	297 /* All parts of this function are wrong if it's called by multiple
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	298 * threads simultaneously.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	299 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	300 if (keymutex == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	301 keymutex = PyThread_allocate_lock();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	302 return ++nkeys;
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	303 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	304
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	305 /* 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	306 void
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	307 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	308 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	309 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	310
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	311 PyThread_acquire_lock(keymutex, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	312 q = &keyhead;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	313 while ((p = *q) != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	314 if (p->key == key) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	315 *q = p->next;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	316 free((void *)p);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	317 /* NB This does not free p->value! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	318 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	319 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	320 q = &p->next;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	321 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	322 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	323 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	324
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	325 /* 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	326 * 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	327 * 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	328 * 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	329 * 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	330 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	331 int
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	332 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	333 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	334 struct key *p;
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	335
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	336 assert(value != NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	337 p = find_key(key, value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	338 if (p == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	339 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	340 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	341 return 0;
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	342 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	343
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	344 /* 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	345 * 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	346 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	347 void *
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	348 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	349 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	350 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	351
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	352 if (p == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	353 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	354 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	355 return p->value;
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	356 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	357
33705 891042c94aed Document the results of painful reverse-engineering of the "portable TLS" Tim Peters <tim.peters@gmail.com> parents: 33699 diff changeset	358 /* 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	359 void
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33145 diff changeset	360 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	361 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	362 long id = PyThread_get_thread_ident();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	363 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	364
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	365 PyThread_acquire_lock(keymutex, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	366 q = &keyhead;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	367 while ((p = *q) != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	368 if (p->key == key && p->id == id) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	369 *q = p->next;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	370 free((void *)p);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	371 /* NB This does not free p->value! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	372 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	373 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	374 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	375 q = &p->next;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	376 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	377 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	378 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	379
47665 71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	380 /* Forget everything not associated with the current thread id.
71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	381 * This function is called from PyOS_AfterFork(). It is necessary
71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	382 * because other thread ids which were in use at the time of the fork
71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	383 * may be reused for new threads created in the forked process.
71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	384 */
71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	385 void
71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	386 PyThread_ReInitTLS(void)
71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	387 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	388 long id = PyThread_get_thread_ident();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	389 struct key p, *q;
47665 71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	390
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	391 if (!keymutex)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	392 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	393
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	394 /* As with interpreter_lock in PyEval_ReInitThreads()
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	395 we just create a new lock without freeing the old one */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	396 keymutex = PyThread_allocate_lock();
47665 71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	397
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	398 /* Delete all keys which do not match the current thread id */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	399 q = &keyhead;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	400 while ((p = *q) != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	401 if (p->id != id) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	402 *q = p->next;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	403 free((void *)p);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	404 /* NB This does not free p->value! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	405 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	406 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	407 q = &p->next;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56730 diff changeset	408 }
47665 71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	409 }
71cb7ea4f110 Merged revisions 64212 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 44587 diff changeset	410
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 24315 diff changeset	411 #endif /* Py_HAVE_NATIVE_TLS */

Mercurial > cpython-lru_cache-weakref

annotate Python/thread.c @ 65483:244cbcb67dcd