cpython-lru_cache-weakref: Python/thread

annotate Python/thread_nt.h @ 61774:55e2368f72f2 2.6

Merged revisions 81380 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81380 | brett.cannon | 2010-05-20 11:37:55 -0700 (Thu, 20 May 2010) | 8 lines Turned out that if you used explicit relative import syntax (e.g. from .os import sep) and it failed, import would still try the implicit relative import semantics of an absolute import (from os import sep). That's not right, so when level is negative, only do explicit relative import semantics. Fixes issue #7902. Thanks to Meador Inge for the patch. ........

author	Brett Cannon <bcannon@gmail.com>
date	Thu, 20 May 2010 18:41:08 +0000
parents	e38335d4df91
children	787b969d37f0

rev	line source
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	1
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	2 /* This code implemented by Dag.Gruneau@elsa.preseco.comm.se */
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	3 /* Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru */
22092 7a3e03b541ff SF patch 522961: Leak in Python/thread_nt.h, from Gerald S. Williams. Tim Peters <tim.peters@gmail.com> parents: 21766 diff changeset	4 /* Eliminated some memory leaks, gsw@agere.com */
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	5
6029 68f2d7704180 Use _beginthread() and _endthread() in favor of CreateThread() and Guido van Rossum <guido@python.org> parents: 4503 diff changeset	6 #include <windows.h>
68f2d7704180 Use _beginthread() and _endthread() in favor of CreateThread() and Guido van Rossum <guido@python.org> parents: 4503 diff changeset	7 #include <limits.h>
38716 42808526511c Patch #1495999: Part two of Windows CE changes. Martin v. Löwis <martin@v.loewis.de> parents: 38592 diff changeset	8 #ifdef HAVE_PROCESS_H
6029 68f2d7704180 Use _beginthread() and _endthread() in favor of CreateThread() and Guido van Rossum <guido@python.org> parents: 4503 diff changeset	9 #include <process.h>
38716 42808526511c Patch #1495999: Part two of Windows CE changes. Martin v. Löwis <martin@v.loewis.de> parents: 38592 diff changeset	10 #endif
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	11
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	12 typedef struct NRMUTEX {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	13 LONG owned ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	14 DWORD thread_id ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	15 HANDLE hevent ;
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	16 } NRMUTEX, *PNRMUTEX ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	17
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	18
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	19 BOOL
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	20 InitializeNonRecursiveMutex(PNRMUTEX mutex)
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	21 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	22 mutex->owned = -1 ; /* No threads have entered NonRecursiveMutex */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	23 mutex->thread_id = 0 ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	24 mutex->hevent = CreateEvent(NULL, FALSE, FALSE, NULL) ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	25 return mutex->hevent != NULL ; /* TRUE if the mutex is created */
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	26 }
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	27
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	28 VOID
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	29 DeleteNonRecursiveMutex(PNRMUTEX mutex)
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	30 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	31 /* No in-use check */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	32 CloseHandle(mutex->hevent) ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	33 mutex->hevent = NULL ; /* Just in case */
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	34 }
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	35
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	36 DWORD
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	37 EnterNonRecursiveMutex(PNRMUTEX mutex, BOOL wait)
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	38 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	39 /* Assume that the thread waits successfully */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	40 DWORD ret ;
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	41
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	42 /* InterlockedIncrement(&mutex->owned) == 0 means that no thread currently owns the mutex */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	43 if (!wait)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	44 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	45 if (InterlockedCompareExchange(&mutex->owned, 0, -1) != -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	46 return WAIT_TIMEOUT ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	47 ret = WAIT_OBJECT_0 ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	48 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	49 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	50 ret = InterlockedIncrement(&mutex->owned) ?
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	51 /* Some thread owns the mutex, let's wait... */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	52 WaitForSingleObject(mutex->hevent, INFINITE) : WAIT_OBJECT_0 ;
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	53
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	54 mutex->thread_id = GetCurrentThreadId() ; /* We own it */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	55 return ret ;
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	56 }
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	57
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	58 BOOL
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	59 LeaveNonRecursiveMutex(PNRMUTEX mutex)
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	60 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	61 /* We don't own the mutex */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	62 mutex->thread_id = 0 ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	63 return
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	64 InterlockedDecrement(&mutex->owned) < 0 \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	65 SetEvent(mutex->hevent) ; /* Other threads are waiting, wake one on them up */
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	66 }
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	67
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	68 PNRMUTEX
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	69 AllocNonRecursiveMutex(void)
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	70 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	71 PNRMUTEX mutex = (PNRMUTEX)malloc(sizeof(NRMUTEX)) ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	72 if (mutex && !InitializeNonRecursiveMutex(mutex))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	73 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	74 free(mutex) ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	75 mutex = NULL ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	76 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	77 return mutex ;
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	78 }
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	79
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	80 void
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	81 FreeNonRecursiveMutex(PNRMUTEX mutex)
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	82 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	83 if (mutex)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	84 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	85 DeleteNonRecursiveMutex(mutex) ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	86 free(mutex) ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	87 }
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	88 }
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	89
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 diff changeset	90 long PyThread_get_thread_ident(void);
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	91
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	92 /*
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	93 * Initialization of the C package, should not be needed.
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	94 */
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	95 static void
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	96 PyThread__init_thread(void)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	97 {
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	98 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	99
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	100 /*
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	101 * Thread support.
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	102 */
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	103
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	104 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	105 void (func)(void);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	106 void *arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	107 long id;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	108 HANDLE done;
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	109 } callobj;
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	110
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	111 static int
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	112 bootstrap(void *call)
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	113 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	114 callobj obj = (callobj)call;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	115 /* copy callobj since other thread might free it before we're done */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	116 void (func)(void) = obj->func;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	117 void *arg = obj->arg;
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	118
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	119 obj->id = PyThread_get_thread_ident();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	120 ReleaseSemaphore(obj->done, 1, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	121 func(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	122 return 0;
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	123 }
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	124
29755 59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	125 long
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	126 PyThread_start_new_thread(void (func)(void ), void *arg)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	127 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	128 Py_uintptr_t rv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	129 callobj obj;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	130
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	131 dprintf(("%ld: PyThread_start_new_thread called\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	132 PyThread_get_thread_ident()));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	133 if (!initialized)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	134 PyThread_init_thread();
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	135
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	136 obj.id = -1; /* guilty until proved innocent */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	137 obj.func = func;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	138 obj.arg = arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	139 obj.done = CreateSemaphore(NULL, 0, 1, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	140 if (obj.done == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	141 return -1;
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	142
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	143 rv = _beginthread(bootstrap,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	144 Py_SAFE_DOWNCAST(_pythread_stacksize,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	145 Py_ssize_t, int),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	146 &obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	147 if (rv == (Py_uintptr_t)-1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	148 /* I've seen errno == EAGAIN here, which means "there are
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	149 * too many threads".
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	150 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	151 dprintf(("%ld: PyThread_start_new_thread failed: %p errno %d\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	152 PyThread_get_thread_ident(), (void*)rv, errno));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	153 obj.id = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	154 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	155 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	156 dprintf(("%ld: PyThread_start_new_thread succeeded: %p\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	157 PyThread_get_thread_ident(), (void*)rv));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	158 /* wait for thread to initialize, so we can get its id */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	159 WaitForSingleObject(obj.done, INFINITE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	160 assert(obj.id != -1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	161 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	162 CloseHandle((HANDLE)obj.done);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	163 return obj.id;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	164 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	165
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	166 /*
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	167 * Return the thread Id instead of an handle. The Id is said to uniquely identify the
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	168 * thread in the system
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	169 */
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	170 long
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	171 PyThread_get_thread_ident(void)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	172 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	173 if (!initialized)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	174 PyThread_init_thread();
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	175
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	176 return GetCurrentThreadId();
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	177 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	178
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	179 static void
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	180 do_PyThread_exit_thread(int no_cleanup)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	181 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	182 dprintf(("%ld: PyThread_exit_thread called\n", PyThread_get_thread_ident()));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	183 if (!initialized)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	184 if (no_cleanup)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	185 _exit(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	186 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	187 exit(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	188 _endthread();
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	189 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	190
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	191 void
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	192 PyThread_exit_thread(void)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	193 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	194 do_PyThread_exit_thread(0);
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	195 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	196
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	197 void
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	198 PyThread__exit_thread(void)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	199 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	200 do_PyThread_exit_thread(1);
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	201 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	202
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	203 #ifndef NO_EXIT_PROG
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	204 static void
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	205 do_PyThread_exit_prog(int status, int no_cleanup)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	206 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	207 dprintf(("PyThread_exit_prog(%d) called\n", status));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	208 if (!initialized)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	209 if (no_cleanup)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	210 _exit(status);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	211 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	212 exit(status);
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	213 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	214
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	215 void
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	216 PyThread_exit_prog(int status)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	217 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	218 do_PyThread_exit_prog(status, 0);
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	219 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	220
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	221 void
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	222 PyThread__exit_prog(int status)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	223 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	224 do_PyThread_exit_prog(status, 1);
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	225 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	226 #endif /* NO_EXIT_PROG */
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	227
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	228 /*
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	229 * Lock support. It has too be implemented as semaphores.
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	230 * I [Dag] tried to implement it with mutex but I could find a way to
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	231 * tell whether a thread already own the lock or not.
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	232 */
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	233 PyThread_type_lock
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	234 PyThread_allocate_lock(void)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	235 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	236 PNRMUTEX aLock;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	237
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	238 dprintf(("PyThread_allocate_lock called\n"));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	239 if (!initialized)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	240 PyThread_init_thread();
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	241
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	242 aLock = AllocNonRecursiveMutex() ;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	243
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	244 dprintf(("%ld: PyThread_allocate_lock() -> %p\n", PyThread_get_thread_ident(), aLock));
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	245
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	246 return (PyThread_type_lock) aLock;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	247 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	248
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	249 void
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	250 PyThread_free_lock(PyThread_type_lock aLock)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	251 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	252 dprintf(("%ld: PyThread_free_lock(%p) called\n", PyThread_get_thread_ident(),aLock));
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	253
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	254 FreeNonRecursiveMutex(aLock) ;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	255 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	256
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	257 /*
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	258 * Return 1 on success if the lock was acquired
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	259 *
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	260 * and 0 if the lock was not acquired. This means a 0 is returned
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	261 * if the lock has already been acquired by this thread!
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	262 */
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	263 int
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	264 PyThread_acquire_lock(PyThread_type_lock aLock, int waitflag)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	265 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	266 int success ;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	267
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	268 dprintf(("%ld: PyThread_acquire_lock(%p, %d) called\n", PyThread_get_thread_ident(),aLock, waitflag));
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	269
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	270 success = aLock && EnterNonRecursiveMutex((PNRMUTEX) aLock, (waitflag ? INFINITE : 0)) == WAIT_OBJECT_0 ;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	271
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	272 dprintf(("%ld: PyThread_acquire_lock(%p, %d) -> %d\n", PyThread_get_thread_ident(),aLock, waitflag, success));
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	273
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	274 return success;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	275 }
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	276
38579 19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	277 void
19430cdff2bd clean up function declarations to conform to PEP-7 style. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38578 diff changeset	278 PyThread_release_lock(PyThread_type_lock aLock)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	279 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	280 dprintf(("%ld: PyThread_release_lock(%p) called\n", PyThread_get_thread_ident(),aLock));
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	281
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	282 if (!(aLock && LeaveNonRecursiveMutex((PNRMUTEX) aLock)))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	283 dprintf(("%ld: Could not PyThread_release_lock(%p) error: %ld\n", PyThread_get_thread_ident(), aLock, GetLastError()));
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	284 }
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	285
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	286 /* minimum/maximum thread stack sizes supported */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	287 #define THREAD_MIN_STACKSIZE 0x8000 /* 32kB */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	288 #define THREAD_MAX_STACKSIZE 0x10000000 /* 256MB */
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	289
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	290 /* set the thread stack size.
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	291 * Return 0 if size is valid, -1 otherwise.
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	292 */
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	293 static int
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	294 _pythread_nt_set_stacksize(size_t size)
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	295 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	296 /* set to default */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	297 if (size == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	298 _pythread_stacksize = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	299 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	300 }
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	301
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	302 /* valid range? */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	303 if (size >= THREAD_MIN_STACKSIZE && size < THREAD_MAX_STACKSIZE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	304 _pythread_stacksize = size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	305 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	306 }
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	307
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	308 return -1;
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	309 }
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38716 diff changeset	310
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 41590 diff changeset	311 #define THREAD_SET_STACKSIZE(x) _pythread_nt_set_stacksize(x)

Mercurial > cpython-lru_cache-weakref

annotate Python/thread_nt.h @ 61774:55e2368f72f2 2.6