cpython-lru_cache-weakref: Python/thread

annotate Python/thread_nt.h @ 45852:30c4e1ca8421

Merged revisions 61431,61433-61436,61439,61444,61449-61450,61453,61458,61465,61468,61471-61474,61480,61483-61484,61488,61495-61496,61498,61503-61504,61507,61509-61510,61515-61518 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r61431 | vinay.sajip | 2008-03-16 22:35:58 +0100 (So, 16 Mär 2008) | 1 line Clarified documentation on use of shutdown(). ........ r61433 | mark.summerfield | 2008-03-17 09:28:15 +0100 (Mo, 17 Mär 2008) | 5 lines Added a footnote to each pointing out that for XML output if an encoding string is given it should conform to the appropriate XML standards---for example, "UTF-8" is okay, but "UTF8" is not. ........ r61434 | eric.smith | 2008-03-17 12:01:01 +0100 (Mo, 17 Mär 2008) | 7 lines Issue 2264: empty float presentation type needs to have at least one digit past the decimal point. Added "Z" format_char to PyOS_ascii_formatd to support empty float presentation type. Renamed buf_size in PyOS_ascii_formatd to more accurately reflect it's meaning. Modified format.__float__ to use the new "Z" format as the default. Added test cases. ........ r61435 | eric.smith | 2008-03-17 13:14:29 +0100 (Mo, 17 Mär 2008) | 2 lines Reformated lines > 79 chars. Deleted unused macro ISXDIGIT. ........ r61436 | jeffrey.yasskin | 2008-03-17 15:40:53 +0100 (Mo, 17 Mär 2008) | 13 lines Allow Gnu gcc's to build python on OSX by removing -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd from configure. * r22183 added -no-cpp-precomp, which http://gcc.gnu.org/ml/gcc/2005-12/msg00368.html claims hasn't been needed since gcc-3.1. * r25607 added -Wno-long-double to avoid a warning in Include/objimpl.h (issue 525481). The long double is still there, but OSX 10.4's gcc no longer warns about it. * r33666 fixed issue 775892 on OSX 10.3 by adding -mno-fused-madd, which changed the sign of some float 0s. Tim Peters said it wasn't a real issue anyway, and it no longer causes test failures. Fixes issue #1779871. ........ r61439 | martin.v.loewis | 2008-03-17 17:31:57 +0100 (Mo, 17 Mär 2008) | 2 lines Add Trent Nelson. ........ r61444 | travis.oliphant | 2008-03-17 18:36:12 +0100 (Mo, 17 Mär 2008) | 1 line Add necessary headers to back-port new buffer protocol to Python 2.6 ........ r61449 | gregory.p.smith | 2008-03-17 19:48:05 +0100 (Mo, 17 Mär 2008) | 8 lines Force zlib.crc32 and zlib.adler32 to return a signed integer on all platforms regardless of the native sizeof(long) used in the integer object. This somewhat odd behavior of returning a signed is maintained in 2.x for compatibility reasons of always returning an integer rather than a long object. Fixes Issue1202 for Python 2.6 ........ r61450 | neal.norwitz | 2008-03-17 20:02:45 +0100 (Mo, 17 Mär 2008) | 3 lines Use a buffer large enough to ensure we don't overrun, even if the value is outside the range we expect. ........ r61453 | steven.bethard | 2008-03-17 20:33:11 +0100 (Mo, 17 Mär 2008) | 1 line Document unicode.isnumeric() and unicode.isdecimal() (issue2326) ........ r61458 | neal.norwitz | 2008-03-17 21:22:43 +0100 (Mo, 17 Mär 2008) | 5 lines Issue 2321: reduce memory usage (increase the memory that is returned to the system) by using pymalloc for the data of unicode objects. Will backport. ........ r61465 | martin.v.loewis | 2008-03-17 22:55:30 +0100 (Mo, 17 Mär 2008) | 2 lines Add David Wolever. ........ r61468 | gregory.p.smith | 2008-03-18 01:20:01 +0100 (Di, 18 Mär 2008) | 3 lines Fix the IOError message text when opening a file with an invalid filename. Error reported by Ilan Schnell. ........ r61471 | brett.cannon | 2008-03-18 02:00:07 +0100 (Di, 18 Mär 2008) | 2 lines Convert test_strftime, test_getargs, and test_pep247 to use unittest. ........ r61472 | jeffrey.yasskin | 2008-03-18 02:09:59 +0100 (Di, 18 Mär 2008) | 2 lines Fix build on platforms that don't have intptr_t. Patch by Joseph Armbruster. ........ r61473 | brett.cannon | 2008-03-18 02:50:25 +0100 (Di, 18 Mär 2008) | 2 lines Convert test_dummy_threading and test_dbm to unittest. ........ r61474 | brett.cannon | 2008-03-18 02:58:56 +0100 (Di, 18 Mär 2008) | 2 lines Move test_extcall to doctest. ........ r61480 | brett.cannon | 2008-03-18 04:46:22 +0100 (Di, 18 Mär 2008) | 2 lines test_errno was a no-op test; now it actually tests things and uses unittest. ........ r61483 | brett.cannon | 2008-03-18 05:09:00 +0100 (Di, 18 Mär 2008) | 3 lines Remove our implementation of memmove() and strerror(); both are in the C89 standard library. ........ r61484 | brett.cannon | 2008-03-18 05:16:06 +0100 (Di, 18 Mär 2008) | 2 lines The output directory for tests that compare against stdout is now gone! ........ r61488 | jeffrey.yasskin | 2008-03-18 05:29:35 +0100 (Di, 18 Mär 2008) | 2 lines Block the "socket.ssl() is deprecated" warning from test_socket_ssl. ........ r61495 | jeffrey.yasskin | 2008-03-18 05:56:06 +0100 (Di, 18 Mär 2008) | 4 lines Speed test_thread up from 51.328s to 0.081s by reducing its sleep times. We still sleep at all to make it likely that all threads are active at the same time. ........ r61496 | jeffrey.yasskin | 2008-03-18 06:12:41 +0100 (Di, 18 Mär 2008) | 4 lines Speed up test_dict by about 10x by only checking selected dict literal sizes, instead of every integer from 0 to 400. Exhaustive testing wastes time without providing enough more assurance that the code is correct. ........ r61498 | neal.norwitz | 2008-03-18 06:20:29 +0100 (Di, 18 Mär 2008) | 1 line Try increasing the timeout to reduce the flakiness of this test. ........ r61503 | brett.cannon | 2008-03-18 06:43:04 +0100 (Di, 18 Mär 2008) | 2 lines Improve the error message for a test that failed on the S-390 Debian buildbot. ........ r61504 | jeffrey.yasskin | 2008-03-18 06:45:40 +0100 (Di, 18 Mär 2008) | 3 lines Add a -S/--slow flag to regrtest to have it print the 10 slowest tests with their times. ........ r61507 | neal.norwitz | 2008-03-18 07:03:46 +0100 (Di, 18 Mär 2008) | 1 line Add some info to the failure messages ........ r61509 | trent.nelson | 2008-03-18 08:02:12 +0100 (Di, 18 Mär 2008) | 1 line Issue 2286: bump up the stack size of the 64-bit debug python_d.exe to 2100000. The default value of 200000 causes a stack overflow at 1965 iterations of r_object() in marshal.c, 35 iterations before the 2000 limit enforced by MAX_MARSHAL_STACK_DEPTH. ........ r61510 | trent.nelson | 2008-03-18 08:32:47 +0100 (Di, 18 Mär 2008) | 5 lines The behaviour of winsound.Beep() seems to differ between different versions of Windows when there's either: a) no sound card entirely b) legacy beep driver has been disabled c) the legacy beep driver has been uninstalled Sometimes RuntimeErrors are raised, sometimes they're not. If _have_soundcard() returns False, don't expect winsound.Beep() to raise a RuntimeError, as this clearly isn't the case, as demonstrated by the various Win32 XP buildbots. ........ r61515 | martin.v.loewis | 2008-03-18 13:20:15 +0100 (Di, 18 Mär 2008) | 2 lines norwitz-amd64 (gentoo) has EREMOTEIO. ........ r61516 | martin.v.loewis | 2008-03-18 13:45:37 +0100 (Di, 18 Mär 2008) | 2 lines Add more Linux error codes. ........ r61517 | martin.v.loewis | 2008-03-18 14:05:03 +0100 (Di, 18 Mär 2008) | 2 lines Add WSA errors. ........ r61518 | martin.v.loewis | 2008-03-18 14:16:05 +0100 (Di, 18 Mär 2008) | 2 lines Note that the stderr output of the test is intentional. ........

author	Christian Heimes <christian@cheimes.de>
date	Tue, 18 Mar 2008 15:15:01 +0000
parents	00c02c4488ce
children	2b2707ff8bb7

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>
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 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>
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 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 {
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	13 LONG owned ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	14 DWORD thread_id ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	15 HANDLE hevent ;
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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	18
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	19 BOOL
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	22 mutex->owned = -1 ; /* No threads have entered NonRecursiveMutex */
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	23 mutex->thread_id = 0 ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	24 mutex->hevent = CreateEvent(NULL, FALSE, FALSE, NULL) ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	25 return mutex->hevent != NULL ; /* TRUE if the mutex is created */
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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	28 VOID
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	31 /* No in-use check */
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	32 CloseHandle(mutex->hevent) ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	33 mutex->hevent = NULL ; /* Just in case */
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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	36 DWORD
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	39 /* Assume that the thread waits successfully */
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	40 DWORD ret ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	41
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	42 /* InterlockedIncrement(&mutex->owned) == 0 means that no thread currently owns the mutex */
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	43 if (!wait)
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	44 {
41716 00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41554 diff changeset	45 if (InterlockedCompareExchange(&mutex->owned, 0, -1) != -1)
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	46 return WAIT_TIMEOUT ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	47 ret = WAIT_OBJECT_0 ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	48 }
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	49 else
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	50 ret = InterlockedIncrement(&mutex->owned) ?
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	51 /* Some thread owns the mutex, let's wait... */
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	52 WaitForSingleObject(mutex->hevent, INFINITE) : WAIT_OBJECT_0 ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	53
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	54 mutex->thread_id = GetCurrentThreadId() ; /* We own it */
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	55 return ret ;
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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	58 BOOL
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	61 /* We don't own the mutex */
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	62 mutex->thread_id = 0 ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	63 return
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	64 InterlockedDecrement(&mutex->owned) < 0 \|\|
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	65 SetEvent(mutex->hevent) ; /* Other threads are waiting, wake one on them up */
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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	68 PNRMUTEX
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	71 PNRMUTEX mutex = (PNRMUTEX)malloc(sizeof(NRMUTEX)) ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	72 if (mutex && !InitializeNonRecursiveMutex(mutex))
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	73 {
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	74 free(mutex) ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	75 mutex = NULL ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	76 }
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	77 return mutex ;
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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	80 void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	83 if (mutex)
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	84 {
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	85 DeleteNonRecursiveMutex(mutex) ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	86 free(mutex) ;
cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	87 }
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 */
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	95 static void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	105 void (func)(void);
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	106 void *arg;
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	107 long id;
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	108 HANDLE done;
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 {
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	114 callobj obj = (callobj)call;
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	115 /* copy callobj since other thread might free it before we're done */
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	116 void (func)(void) = obj->func;
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	117 void *arg = obj->arg;
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	118
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	119 obj->id = PyThread_get_thread_ident();
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	120 ReleaseSemaphore(obj->done, 1, NULL);
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	121 func(arg);
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 19568 diff changeset	122 return 0;
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 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	128 Py_uintptr_t rv;
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	129 callobj obj;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	130
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	131 dprintf(("%ld: PyThread_start_new_thread called\n",
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	132 PyThread_get_thread_ident()));
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	133 if (!initialized)
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 diff changeset	134 PyThread_init_thread();
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	135
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	136 obj.id = -1; /* guilty until proved innocent */
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	137 obj.func = func;
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	138 obj.arg = arg;
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	139 obj.done = CreateSemaphore(NULL, 0, 1, NULL);
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	140 if (obj.done == NULL)
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 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
41716 00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41554 diff changeset	143 rv = _beginthread(bootstrap,
00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41554 diff changeset	144 Py_SAFE_DOWNCAST(_pythread_stacksize,
00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41554 diff changeset	145 Py_ssize_t, int),
00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41554 diff changeset	146 &obj);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	147 if (rv == (Py_uintptr_t)-1) {
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	148 /* I've seen errno == EAGAIN here, which means "there are
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	149 * too many threads".
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	150 */
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	151 dprintf(("%ld: PyThread_start_new_thread failed: %p errno %d\n",
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 39442 diff changeset	152 PyThread_get_thread_ident(), (void*)rv, errno));
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	153 obj.id = -1;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	154 }
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	155 else {
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	156 dprintf(("%ld: PyThread_start_new_thread succeeded: %p\n",
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 39442 diff changeset	157 PyThread_get_thread_ident(), (void*)rv));
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	158 /* wait for thread to initialize, so we can get its id */
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	159 WaitForSingleObject(obj.done, INFINITE);
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	160 assert(obj.id != -1);
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	161 }
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 diff changeset	162 CloseHandle((HANDLE)obj.done);
59da5b57c61b An Anonymous Coward on c.l.py posted a little program with bizarre Tim Peters <tim.peters@gmail.com> parents: 22092 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 */
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	170 long
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	171 PyThread_get_thread_ident(void)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	172 {
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	173 if (!initialized)
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 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
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	176 return GetCurrentThreadId();
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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	179 static void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 diff changeset	182 dprintf(("%ld: PyThread_exit_thread called\n", PyThread_get_thread_ident()));
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	183 if (!initialized)
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	184 if (no_cleanup)
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	185 _exit(0);
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	186 else
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	187 exit(0);
6029 68f2d7704180 Use _beginthread() and _endthread() in favor of CreateThread() and Guido van Rossum <guido@python.org> parents: 4503 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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	191 void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	192 PyThread_exit_thread(void)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	193 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	197 void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	198 PyThread__exit_thread(void)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	199 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	204 static void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 diff changeset	207 dprintf(("PyThread_exit_prog(%d) called\n", status));
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	208 if (!initialized)
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	209 if (no_cleanup)
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	210 _exit(status);
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	211 else
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	212 exit(status);
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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	215 void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	216 PyThread_exit_prog(int status)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	217 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	221 void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	222 PyThread__exit_prog(int status)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	223 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 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 */
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	233 PyThread_type_lock
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	234 PyThread_allocate_lock(void)
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	235 {
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	236 PNRMUTEX aLock;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	237
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 diff changeset	238 dprintf(("PyThread_allocate_lock called\n"));
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	239 if (!initialized)
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 diff changeset	240 PyThread_init_thread();
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	241
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	242 aLock = AllocNonRecursiveMutex() ;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	243
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13138 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
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6029 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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	249 void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13138 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
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 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 */
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	263 int
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	266 int success ;
2152 1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	267
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13138 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
35217 b86392f55b59 bug [ 1234979 ] Lock.acquire treats only 1 as True Georg Brandl <georg@python.org> parents: 29755 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
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13138 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
1a52351a00b2 nt thread support Guido van Rossum <guido@python.org> parents: diff changeset	274 return success;
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
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	277 void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 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 {
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 13138 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
12584 cde4da18c4fa Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru, Guido van Rossum <guido@python.org> parents: 11673 diff changeset	282 if (!(aLock && LeaveNonRecursiveMutex((PNRMUTEX) aLock)))
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 39442 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 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	285
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	286 /* minimum/maximum thread stack sizes supported */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	287 #define THREAD_MIN_STACKSIZE 0x8000 /* 32kB */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	288 #define THREAD_MAX_STACKSIZE 0x10000000 /* 256MB */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	289
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	290 /* set the thread stack size.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	291 * Return 0 if size is valid, -1 otherwise.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	292 */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	293 static int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	294 _pythread_nt_set_stacksize(size_t size)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	295 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	296 /* set to default */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	297 if (size == 0) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	298 _pythread_stacksize = 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	299 return 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	300 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	301
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	302 /* valid range? */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	303 if (size >= THREAD_MIN_STACKSIZE && size < THREAD_MAX_STACKSIZE) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	304 _pythread_stacksize = size;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	305 return 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	306 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	307
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	308 return -1;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	309 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	310
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	311 #define THREAD_SET_STACKSIZE(x) _pythread_nt_set_stacksize(x)

Mercurial > cpython-lru_cache-weakref

annotate Python/thread_nt.h @ 45852:30c4e1ca8421