cpython-lru_cache-weakref: Python/thread

annotate Python/thread_os2.h @ 64085:4df0d2a13aa1 3.1

Merged revisions 81214,82302,82465,83090-83091,84097,84099 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81214 | brett.cannon | 2010-05-16 00:20:16 +0200 (dim., 16 mai 2010) | 2 lines A test was not guaranteeing cleanup in the face of an exception. ................ r82302 | benjamin.peterson | 2010-06-28 00:37:28 +0200 (lun., 28 juin 2010) | 15 lines Merged revisions 81380 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81380 | brett.cannon | 2010-05-20 13:37:55 -0500 (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. ........ ................ r82465 | brett.cannon | 2010-07-03 03:32:48 +0200 (sam., 03 juil. 2010) | 3 lines Make test_import a little bit more robust for cleaning up after itself in the face of a failure. ................ r83090 | brett.cannon | 2010-07-23 16:03:16 +0200 (ven., 23 juil. 2010) | 4 lines Explicitly test relative imports by reusing importlib tests. Closes issue 8392. Thanks Virgil Dupras for the initial patch. ................ r83091 | brett.cannon | 2010-07-23 16:45:19 +0200 (ven., 23 juil. 2010) | 1 line Stop shadowing a test class. ................ r84097 | florent.xicluna | 2010-08-16 20:41:19 +0200 (lun., 16 août 2010) | 1 line Use test.support and unittest features. Fix duplicated test (bad merge in r79033). Fix comment for issue #7902. ................ r84099 | florent.xicluna | 2010-08-16 21:03:05 +0200 (lun., 16 août 2010) | 1 line I get it wrong in r84097: s/relative/absolute/ ................

author	Florent Xicluna <florent.xicluna@gmail.com>
date	Mon, 16 Aug 2010 22:40:45 +0000
parents	f197407bdba2
children	3c9232a684ae

rev	line source
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	1 /* This code implemented by cvale@netcom.com */
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	2
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	3 #define INCL_DOSPROCESS
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	4 #define INCL_DOSSEMAPHORES
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	5 #include "os2.h"
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	6 #include "limits.h"
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	7
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	8 #include "process.h"
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	9
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	10 #if defined(PYCC_GCC)
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	11 #include <sys/builtin.h>
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	12 #include <sys/fmutex.h>
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	13 #else
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 6626 diff changeset	14 long PyThread_get_thread_ident(void);
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	15 #endif
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	16
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	17 /* default thread stack size of 64kB */
34433 e1a7eb832cb5 backport: make thread stack size compile-time tunable on OS/2 Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 26531 diff changeset	18 #if !defined(THREAD_STACK_SIZE)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	19 #define THREAD_STACK_SIZE 0x10000
34433 e1a7eb832cb5 backport: make thread stack size compile-time tunable on OS/2 Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 26531 diff changeset	20 #endif
e1a7eb832cb5 backport: make thread stack size compile-time tunable on OS/2 Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 26531 diff changeset	21
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	22 #define OS2_STACKSIZE(x) (x ? x : THREAD_STACK_SIZE)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	23
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	24 /*
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	25 * Initialization of the C package, should not be needed.
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	26 */
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	27 static void
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	28 PyThread__init_thread(void)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	29 {
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	30 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	31
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	32 /*
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	33 * Thread support.
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	34 */
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 14375 diff changeset	35 long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	36 PyThread_start_new_thread(void (func)(void ), void *arg)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	37 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	38 int thread_id;
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	39
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	40 thread_id = _beginthread(func,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	41 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	42 OS2_STACKSIZE(_pythread_stacksize),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	43 arg);
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	44
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	45 if (thread_id == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	46 dprintf(("_beginthread failed. return %ld\n", errno));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	47 }
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	48
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	49 return thread_id;
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	50 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	51
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	52 long
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	53 PyThread_get_thread_ident(void)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	54 {
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	55 #if !defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	56 PPIB pib;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	57 PTIB tib;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	58 #endif
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	59
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	60 if (!initialized)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	61 PyThread_init_thread();
26531 8e1567dbcba8 reformat for PEP-7 style conformance Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 26530 diff changeset	62
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	63 #if defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	64 return _gettid();
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	65 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	66 DosGetInfoBlocks(&tib, &pib);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	67 return tib->tib_ptib2->tib2_ultid;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	68 #endif
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	69 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	70
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	71 static void
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	72 do_PyThread_exit_thread(int no_cleanup)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	73 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	74 dprintf(("%ld: PyThread_exit_thread called\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	75 PyThread_get_thread_ident()));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	76 if (!initialized)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	77 if (no_cleanup)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	78 _exit(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	79 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	80 exit(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	81 _endthread();
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	82 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	83
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	84 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	85 PyThread_exit_thread(void)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	86 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	87 do_PyThread_exit_thread(0);
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	88 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	89
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	90 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	91 PyThread__exit_thread(void)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	92 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	93 do_PyThread_exit_thread(1);
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	94 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	95
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	96 #ifndef NO_EXIT_PROG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	97 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	98 do_PyThread_exit_prog(int status, int no_cleanup)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	99 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	100 dprintf(("PyThread_exit_prog(%d) called\n", status));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	101 if (!initialized)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	102 if (no_cleanup)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	103 _exit(status);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	104 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	105 exit(status);
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	106 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	107
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	108 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	109 PyThread_exit_prog(int status)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	110 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	111 do_PyThread_exit_prog(status, 0);
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	112 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	113
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	114 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	115 PyThread__exit_prog(int status)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	116 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	117 do_PyThread_exit_prog(status, 1);
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	118 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	119 #endif /* NO_EXIT_PROG */
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	120
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	121 /*
20782 b1d9029e09d1 SF patch #474500: Make OS/2 locks work like posix locks, from Michael Tim Peters <tim.peters@gmail.com> parents: 20468 diff changeset	122 * Lock support. This is implemented with an event semaphore and critical
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	123 * sections to make it behave more like a posix mutex than its OS/2
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	124 * counterparts.
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	125 */
20782 b1d9029e09d1 SF patch #474500: Make OS/2 locks work like posix locks, from Michael Tim Peters <tim.peters@gmail.com> parents: 20468 diff changeset	126
b1d9029e09d1 SF patch #474500: Make OS/2 locks work like posix locks, from Michael Tim Peters <tim.peters@gmail.com> parents: 20468 diff changeset	127 typedef struct os2_lock_t {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	128 int is_set;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	129 HEV changed;
20782 b1d9029e09d1 SF patch #474500: Make OS/2 locks work like posix locks, from Michael Tim Peters <tim.peters@gmail.com> parents: 20468 diff changeset	130 } *type_os2_lock;
b1d9029e09d1 SF patch #474500: Make OS/2 locks work like posix locks, from Michael Tim Peters <tim.peters@gmail.com> parents: 20468 diff changeset	131
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	132 PyThread_type_lock
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	133 PyThread_allocate_lock(void)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	134 {
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	135 #if defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	136 _fmutex *sem = malloc(sizeof(_fmutex));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	137 if (!initialized)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	138 PyThread_init_thread();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	139 dprintf(("%ld: PyThread_allocate_lock() -> %lx\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	140 PyThread_get_thread_ident(),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	141 (long)sem));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	142 if (_fmutex_create(sem, 0)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	143 free(sem);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	144 sem = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	145 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	146 return (PyThread_type_lock)sem;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	147 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	148 APIRET rc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	149 type_os2_lock lock = (type_os2_lock)malloc(sizeof(struct os2_lock_t));
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	150
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	151 dprintf(("PyThread_allocate_lock called\n"));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	152 if (!initialized)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	153 PyThread_init_thread();
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	154
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	155 lock->is_set = 0;
20782 b1d9029e09d1 SF patch #474500: Make OS/2 locks work like posix locks, from Michael Tim Peters <tim.peters@gmail.com> parents: 20468 diff changeset	156
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	157 DosCreateEventSem(NULL, &lock->changed, 0, 0);
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	158
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	159 dprintf(("%ld: PyThread_allocate_lock() -> %p\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	160 PyThread_get_thread_ident(),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	161 lock->changed));
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	162
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	163 return (PyThread_type_lock)lock;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	164 #endif
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	165 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	166
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	167 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	168 PyThread_free_lock(PyThread_type_lock aLock)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	169 {
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	170 #if !defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	171 type_os2_lock lock = (type_os2_lock)aLock;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	172 #endif
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	173
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	174 dprintf(("%ld: PyThread_free_lock(%p) called\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	175 PyThread_get_thread_ident(),aLock));
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	176
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	177 #if defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	178 if (aLock) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	179 _fmutex_close((_fmutex *)aLock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	180 free((_fmutex *)aLock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	181 }
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	182 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	183 DosCloseEventSem(lock->changed);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	184 free(aLock);
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	185 #endif
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	186 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	187
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	188 /*
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	189 * Return 1 on success if the lock was acquired
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	190 *
20782 b1d9029e09d1 SF patch #474500: Make OS/2 locks work like posix locks, from Michael Tim Peters <tim.peters@gmail.com> parents: 20468 diff changeset	191 * and 0 if the lock was not acquired.
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	192 */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	193 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	194 PyThread_acquire_lock(PyThread_type_lock aLock, int waitflag)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	195 {
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	196 #if !defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	197 int done = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	198 ULONG count;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	199 PID pid = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	200 TID tid = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	201 type_os2_lock lock = (type_os2_lock)aLock;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	202 #endif
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	203
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	204 dprintf(("%ld: PyThread_acquire_lock(%p, %d) called\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	205 PyThread_get_thread_ident(),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	206 aLock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	207 waitflag));
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	208
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	209 #if defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	210 /* always successful if the lock doesn't exist */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	211 if (aLock &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	212 _fmutex_request((_fmutex *)aLock, waitflag ? 0 : _FMR_NOWAIT))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	213 return 0;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	214 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	215 while (!done) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	216 /* if the lock is currently set, we have to wait for
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	217 * the state to change
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	218 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	219 if (lock->is_set) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	220 if (!waitflag)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	221 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	222 DosWaitEventSem(lock->changed, SEM_INDEFINITE_WAIT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	223 }
20782 b1d9029e09d1 SF patch #474500: Make OS/2 locks work like posix locks, from Michael Tim Peters <tim.peters@gmail.com> parents: 20468 diff changeset	224
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	225 /* enter a critical section and try to get the semaphore. If
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	226 * it is still locked, we will try again.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	227 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	228 if (DosEnterCritSec())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	229 return 0;
20782 b1d9029e09d1 SF patch #474500: Make OS/2 locks work like posix locks, from Michael Tim Peters <tim.peters@gmail.com> parents: 20468 diff changeset	230
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	231 if (!lock->is_set) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	232 lock->is_set = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	233 DosResetEventSem(lock->changed, &count);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	234 done = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	235 }
26531 8e1567dbcba8 reformat for PEP-7 style conformance Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 26530 diff changeset	236
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	237 DosExitCritSec();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	238 }
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	239 #endif
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	240
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	241 return 1;
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	242 }
063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	243
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 34433 diff changeset	244 void
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 34433 diff changeset	245 PyThread_release_lock(PyThread_type_lock aLock)
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	246 {
26530 b5837b8f3b2c typo fix: declaration required for VACPP not EMX+gcc Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22054 diff changeset	247 #if !defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	248 type_os2_lock lock = (type_os2_lock)aLock;
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	249 #endif
5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	250
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	251 dprintf(("%ld: PyThread_release_lock(%p) called\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	252 PyThread_get_thread_ident(),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	253 aLock));
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	254
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	255 #if defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	256 if (aLock)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	257 _fmutex_release((_fmutex *)aLock);
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	258 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	259 if (!lock->is_set) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	260 dprintf(("%ld: Could not PyThread_release_lock(%p) error: %l\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	261 PyThread_get_thread_ident(),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	262 aLock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	263 GetLastError()));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	264 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	265 }
20782 b1d9029e09d1 SF patch #474500: Make OS/2 locks work like posix locks, from Michael Tim Peters <tim.peters@gmail.com> parents: 20468 diff changeset	266
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	267 if (DosEnterCritSec()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	268 dprintf(("%ld: Could not PyThread_release_lock(%p) error: %l\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	269 PyThread_get_thread_ident(),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	270 aLock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	271 GetLastError()));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	272 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	273 }
26531 8e1567dbcba8 reformat for PEP-7 style conformance Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 26530 diff changeset	274
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	275 lock->is_set = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	276 DosPostEventSem(lock->changed);
26531 8e1567dbcba8 reformat for PEP-7 style conformance Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 26530 diff changeset	277
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	278 DosExitCritSec();
22054 5cbcfde3ad55 OS/2 EMX port changes (Python part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21766 diff changeset	279 #endif
2649 063a96b49b3e OS/2 thread support Guido van Rossum <guido@python.org> parents: diff changeset	280 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	281
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	282 /* minimum/maximum thread stack sizes supported */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	283 #define THREAD_MIN_STACKSIZE 0x8000 /* 32kB */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	284 #define THREAD_MAX_STACKSIZE 0x2000000 /* 32MB */
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 /* set the thread stack size.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	287 * 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	288 */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	289 static int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	290 _pythread_os2_set_stacksize(size_t size)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	291 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	292 /* set to default */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	293 if (size == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	294 _pythread_stacksize = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	295 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	296 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	297
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	298 /* valid range? */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	299 if (size >= THREAD_MIN_STACKSIZE && size < THREAD_MAX_STACKSIZE) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	300 _pythread_stacksize = size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	301 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	302 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	303
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	304 return -1;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	305 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	306
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 39442 diff changeset	307 #define THREAD_SET_STACKSIZE(x) _pythread_os2_set_stacksize(x)

Mercurial > cpython-lru_cache-weakref

annotate Python/thread_os2.h @ 64085:4df0d2a13aa1 3.1