cpython-lru_cache-weakref: Python/thread

annotate Python/thread_pthread.h @ 62570:32651ee779ed

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. ........

author	Benjamin Peterson <benjamin@python.org>
date	Sun, 27 Jun 2010 22:37:28 +0000
parents	cab14be0ada1
children	8e428b8e7d81

rev	line source
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	1
3663 07164d30429d Got rid of florida hack and made it work with Solaris 2.5 pthreads. Guido van Rossum <guido@python.org> parents: 2097 diff changeset	2 /* Posix threads interface */
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	3
3663 07164d30429d Got rid of florida hack and made it work with Solaris 2.5 pthreads. Guido van Rossum <guido@python.org> parents: 2097 diff changeset	4 #include <stdlib.h>
9290 2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	5 #include <string.h>
25545 3731be28e1a3 Patch #618347: Work around Solaris 2.6 pthread.h bug. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 22341 diff changeset	6 #if defined(__APPLE__) \|\| defined(HAVE_PTHREAD_DESTRUCTOR)
21724 884e57bf3ada Workaround for what is probably a problem in Apple's gcc: <pthread.h> fails Jack Jansen <jack.jansen@cwi.nl> parents: 20922 diff changeset	7 #define destructor xxdestructor
884e57bf3ada Workaround for what is probably a problem in Apple's gcc: <pthread.h> fails Jack Jansen <jack.jansen@cwi.nl> parents: 20922 diff changeset	8 #endif
3663 07164d30429d Got rid of florida hack and made it work with Solaris 2.5 pthreads. Guido van Rossum <guido@python.org> parents: 2097 diff changeset	9 #include <pthread.h>
25545 3731be28e1a3 Patch #618347: Work around Solaris 2.6 pthread.h bug. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 22341 diff changeset	10 #if defined(__APPLE__) \|\| defined(HAVE_PTHREAD_DESTRUCTOR)
21724 884e57bf3ada Workaround for what is probably a problem in Apple's gcc: <pthread.h> fails Jack Jansen <jack.jansen@cwi.nl> parents: 20922 diff changeset	11 #undef destructor
884e57bf3ada Workaround for what is probably a problem in Apple's gcc: <pthread.h> fails Jack Jansen <jack.jansen@cwi.nl> parents: 20922 diff changeset	12 #endif
20398 c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	13 #include <signal.h>
22341 2548e2f323fa Document that _POSIX_SEMAPHORES is predefined. Martin v. Löwis <martin@v.loewis.de> parents: 22339 diff changeset	14
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	15 /* The POSIX spec requires that use of pthread_attr_setstacksize
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	16 be conditional on _POSIX_THREAD_ATTR_STACKSIZE being defined. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	17 #ifdef _POSIX_THREAD_ATTR_STACKSIZE
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	18 #ifndef THREAD_STACK_SIZE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	19 #define THREAD_STACK_SIZE 0 /* use default stack size */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	20 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	21 /* for safety, ensure a viable minimum stacksize */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	22 #define THREAD_STACK_MIN 0x8000 /* 32kB */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	23 #else /* !_POSIX_THREAD_ATTR_STACKSIZE */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	24 #ifdef THREAD_STACK_SIZE
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	25 #error "THREAD_STACK_SIZE defined but _POSIX_THREAD_ATTR_STACKSIZE undefined"
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	26 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	27 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	28
22341 2548e2f323fa Document that _POSIX_SEMAPHORES is predefined. Martin v. Löwis <martin@v.loewis.de> parents: 22339 diff changeset	29 /* The POSIX spec says that implementations supporting the sem_*
2548e2f323fa Document that _POSIX_SEMAPHORES is predefined. Martin v. Löwis <martin@v.loewis.de> parents: 22339 diff changeset	30 family of functions must indicate this by defining
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	31 _POSIX_SEMAPHORES. */
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	32 #ifdef _POSIX_SEMAPHORES
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	33 /* On FreeBSD 4.x, _POSIX_SEMAPHORES is defined empty, so
34824 a50ffe65911b Add 0 to _POSIX_SEMAPHORES. Martin v. Löwis <martin@v.loewis.de> parents: 34762 diff changeset	34 we need to add 0 to make it work there as well. */
a50ffe65911b Add 0 to _POSIX_SEMAPHORES. Martin v. Löwis <martin@v.loewis.de> parents: 34762 diff changeset	35 #if (_POSIX_SEMAPHORES+0) == -1
34762 fcb507414c41 Patch #1163249 - Correctly handle _POSIX_SEMAPHORES == -1 to mean no Anthony Baxter <anthonybaxter@gmail.com> parents: 32526 diff changeset	36 #define HAVE_BROKEN_POSIX_SEMAPHORES
fcb507414c41 Patch #1163249 - Correctly handle _POSIX_SEMAPHORES == -1 to mean no Anthony Baxter <anthonybaxter@gmail.com> parents: 32526 diff changeset	37 #else
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	38 #include <semaphore.h>
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	39 #include <errno.h>
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	40 #endif
34762 fcb507414c41 Patch #1163249 - Correctly handle _POSIX_SEMAPHORES == -1 to mean no Anthony Baxter <anthonybaxter@gmail.com> parents: 32526 diff changeset	41 #endif
3663 07164d30429d Got rid of florida hack and made it work with Solaris 2.5 pthreads. Guido van Rossum <guido@python.org> parents: 2097 diff changeset	42
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 35607 diff changeset	43 /* Before FreeBSD 5.4, system scope threads was very limited resource
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 35607 diff changeset	44 in default setting. So the process scope is preferred to get
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 35607 diff changeset	45 enough number of threads to work. */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 35607 diff changeset	46 #ifdef __FreeBSD__
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 35607 diff changeset	47 #include <osreldate.h>
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 35607 diff changeset	48 #if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 35607 diff changeset	49 #undef PTHREAD_SYSTEM_SCHED_SUPPORTED
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 35607 diff changeset	50 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 35607 diff changeset	51 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 35607 diff changeset	52
26598 56dbd9079a13 Patch #650415: Avoid redefinition of macros. Martin v. Löwis <martin@v.loewis.de> parents: 26499 diff changeset	53 #if !defined(pthread_attr_default)
5493 ef93d51dab36 Support for various versions of the pthread draft. Guido van Rossum <guido@python.org> parents: 5395 diff changeset	54 # define pthread_attr_default ((pthread_attr_t *)NULL)
26598 56dbd9079a13 Patch #650415: Avoid redefinition of macros. Martin v. Löwis <martin@v.loewis.de> parents: 26499 diff changeset	55 #endif
56dbd9079a13 Patch #650415: Avoid redefinition of macros. Martin v. Löwis <martin@v.loewis.de> parents: 26499 diff changeset	56 #if !defined(pthread_mutexattr_default)
5493 ef93d51dab36 Support for various versions of the pthread draft. Guido van Rossum <guido@python.org> parents: 5395 diff changeset	57 # define pthread_mutexattr_default ((pthread_mutexattr_t *)NULL)
26598 56dbd9079a13 Patch #650415: Avoid redefinition of macros. Martin v. Löwis <martin@v.loewis.de> parents: 26499 diff changeset	58 #endif
56dbd9079a13 Patch #650415: Avoid redefinition of macros. Martin v. Löwis <martin@v.loewis.de> parents: 26499 diff changeset	59 #if !defined(pthread_condattr_default)
5493 ef93d51dab36 Support for various versions of the pthread draft. Guido van Rossum <guido@python.org> parents: 5395 diff changeset	60 # define pthread_condattr_default ((pthread_condattr_t *)NULL)
3965 9c05ff6fb0a4 Changes necessary for AIX. Guido van Rossum <guido@python.org> parents: 3663 diff changeset	61 #endif
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	62
5493 ef93d51dab36 Support for various versions of the pthread draft. Guido van Rossum <guido@python.org> parents: 5395 diff changeset	63
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	64 /* Whether or not to use semaphores directly rather than emulating them with
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	65 * mutexes and condition variables:
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	66 */
27320 1562c1e10b49 Don't use Posix semaphores on Solaris 8. Fixes #662787. Martin v. Löwis <martin@v.loewis.de> parents: 26598 diff changeset	67 #if defined(_POSIX_SEMAPHORES) && !defined(HAVE_BROKEN_POSIX_SEMAPHORES)
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	68 # define USE_SEMAPHORES
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	69 #else
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	70 # undef USE_SEMAPHORES
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	71 #endif
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	72
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	73
20398 c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	74 /* On platforms that don't use standard POSIX threads pthread_sigmask()
c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	75 * isn't present. DEC threads uses sigprocmask() instead as do most
c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	76 * other UNIX International compliant systems that don't have the full
c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	77 * pthread implementation.
c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	78 */
29972 a408ac5527c3 Patch 775605: Cygwin pthread_sigmask() workaround patch Jason Tishler <jason@tishler.net> parents: 28687 diff changeset	79 #if defined(HAVE_PTHREAD_SIGMASK) && !defined(HAVE_BROKEN_PTHREAD_SIGMASK)
20398 c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	80 # define SET_THREAD_SIGMASK pthread_sigmask
c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	81 #else
c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	82 # define SET_THREAD_SIGMASK sigprocmask
c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	83 #endif
c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	84
c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	85
60598 01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	86 /* We assume all modern POSIX systems have gettimeofday() */
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	87 #ifdef GETTIMEOFDAY_NO_TZ
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	88 #define GETTIMEOFDAY(ptv) gettimeofday(ptv)
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	89 #else
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	90 #define GETTIMEOFDAY(ptv) gettimeofday(ptv, (struct timezone *)NULL)
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	91 #endif
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	92
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	93 #define MICROSECONDS_TO_TIMESPEC(microseconds, ts) \
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	94 do { \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	95 struct timeval tv; \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	96 GETTIMEOFDAY(&tv); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	97 tv.tv_usec += microseconds % 1000000; \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	98 tv.tv_sec += microseconds / 1000000; \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	99 tv.tv_sec += tv.tv_usec / 1000000; \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	100 tv.tv_usec %= 1000000; \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	101 ts.tv_sec = tv.tv_sec; \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	102 ts.tv_nsec = tv.tv_usec * 1000; \
60598 01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	103 } while(0)
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	104
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	105
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	106 /* A pthread mutex isn't sufficient to model the Python lock type
4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	107 * because, according to Draft 5 of the docs (P1003.4a/D5), both of the
4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	108 * following are undefined:
4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	109 * -> a thread tries to lock a mutex it already has locked
4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	110 * -> a thread tries to unlock a mutex locked by a different thread
4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	111 * pthread mutexes are designed for serializing threads over short pieces
4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	112 * of code anyway, so wouldn't be an appropriate implementation of
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	113 * Python's locks regardless.
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	114 *
4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	115 * The pthread_lock struct implements a Python lock as a "locked?" bit
4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	116 * and a <condition, mutex> pair. In general, if the bit can be acquired
4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	117 * instantly, it is, else the pair is used to block the thread until the
4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	118 * bit is cleared. 9 May 1994 tim@ksr.com
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	119 */
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	120
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	121 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	122 char locked; /* 0=unlocked, 1=locked */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	123 /* a <cond, mutex> pair to handle an acquire of a locked lock */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	124 pthread_cond_t lock_released;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	125 pthread_mutex_t mut;
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	126 } pthread_lock;
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	127
9290 2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	128 #define CHECK_STATUS(name) if (status != 0) { perror(name); error = 1; }
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	129
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	130 /*
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	131 * Initialization.
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	132 */
9290 2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	133
2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	134 #ifdef _HAVE_BSDI
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	135 static
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	136 void _noop(void)
9290 2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	137 {
2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	138 }
2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	139
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	140 static void
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	141 PyThread__init_thread(void)
9290 2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	142 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	143 /* DO AN INIT BY STARTING THE THREAD */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	144 static int dummy = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	145 pthread_t thread1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	146 pthread_create(&thread1, NULL, (void *) _noop, &dummy);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	147 pthread_join(thread1, NULL);
9290 2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	148 }
2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	149
2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	150 #else /* !_HAVE_BSDI */
2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	151
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	152 static void
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	153 PyThread__init_thread(void)
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	154 {
9079 4d2cb212c8d1 Apparently on AIX when using gcc you need to call pthread_init() Guido van Rossum <guido@python.org> parents: 9070 diff changeset	155 #if defined(_AIX) && defined(__GNUC__)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	156 pthread_init();
9079 4d2cb212c8d1 Apparently on AIX when using gcc you need to call pthread_init() Guido van Rossum <guido@python.org> parents: 9070 diff changeset	157 #endif
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	158 }
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	159
9290 2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	160 #endif /* !_HAVE_BSDI */
2340f615da8f BSDI specific patches, inspired by Nigel Head and otto@mail.olympus.net. Guido van Rossum <guido@python.org> parents: 9079 diff changeset	161
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	162 /*
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	163 * Thread support.
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	164 */
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	165
4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	166
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20431 diff changeset	167 long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	168 PyThread_start_new_thread(void (func)(void ), void *arg)
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	169 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	170 pthread_t th;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	171 int status;
19826 8ef456949b76 Improve threading on Solaris, according to SF patch #460269, submitted Guido van Rossum <guido@python.org> parents: 19549 diff changeset	172 #if defined(THREAD_STACK_SIZE) \|\| defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	173 pthread_attr_t attrs;
19549 11a758c56027 GUSI on the Mac creates threads with a default stack size of 20KB, which is Jack Jansen <jack.jansen@cwi.nl> parents: 14375 diff changeset	174 #endif
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	175 #if defined(THREAD_STACK_SIZE)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	176 size_t tss;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	177 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	178
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	179 dprintf(("PyThread_start_new_thread called\n"));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	180 if (!initialized)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	181 PyThread_init_thread();
5493 ef93d51dab36 Support for various versions of the pthread draft. Guido van Rossum <guido@python.org> parents: 5395 diff changeset	182
19826 8ef456949b76 Improve threading on Solaris, according to SF patch #460269, submitted Guido van Rossum <guido@python.org> parents: 19549 diff changeset	183 #if defined(THREAD_STACK_SIZE) \|\| defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	184 if (pthread_attr_init(&attrs) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	185 return -1;
19826 8ef456949b76 Improve threading on Solaris, according to SF patch #460269, submitted Guido van Rossum <guido@python.org> parents: 19549 diff changeset	186 #endif
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	187 #if defined(THREAD_STACK_SIZE)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	188 tss = (_pythread_stacksize != 0) ? _pythread_stacksize
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	189 : THREAD_STACK_SIZE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	190 if (tss != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	191 if (pthread_attr_setstacksize(&attrs, tss) != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	192 pthread_attr_destroy(&attrs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	193 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	194 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	195 }
19549 11a758c56027 GUSI on the Mac creates threads with a default stack size of 20KB, which is Jack Jansen <jack.jansen@cwi.nl> parents: 14375 diff changeset	196 #endif
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 35607 diff changeset	197 #if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	198 pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
19826 8ef456949b76 Improve threading on Solaris, according to SF patch #460269, submitted Guido van Rossum <guido@python.org> parents: 19549 diff changeset	199 #endif
20398 c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	200
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	201 status = pthread_create(&th,
19826 8ef456949b76 Improve threading on Solaris, according to SF patch #460269, submitted Guido van Rossum <guido@python.org> parents: 19549 diff changeset	202 #if defined(THREAD_STACK_SIZE) \|\| defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	203 &attrs,
19549 11a758c56027 GUSI on the Mac creates threads with a default stack size of 20KB, which is Jack Jansen <jack.jansen@cwi.nl> parents: 14375 diff changeset	204 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	205 (pthread_attr_t*)NULL,
19549 11a758c56027 GUSI on the Mac creates threads with a default stack size of 20KB, which is Jack Jansen <jack.jansen@cwi.nl> parents: 14375 diff changeset	206 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	207 (void* ()(void ))func,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	208 (void *)arg
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	209 );
20398 c9a212329da6 Add SF patch #468347 -- mask signals for non-main pthreads, by Jason Lowe: Guido van Rossum <guido@python.org> parents: 19826 diff changeset	210
20922 7a991d012cd6 Fix memory leak. This is part of SF patch #478006. Fred Drake <fdrake@acm.org> parents: 20468 diff changeset	211 #if defined(THREAD_STACK_SIZE) \|\| defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	212 pthread_attr_destroy(&attrs);
19549 11a758c56027 GUSI on the Mac creates threads with a default stack size of 20KB, which is Jack Jansen <jack.jansen@cwi.nl> parents: 14375 diff changeset	213 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	214 if (status != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	215 return -1;
28687 40d287c3d906 Patch #716969: Detect thread creation failure. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28673 diff changeset	216
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	217 pthread_detach(th);
28687 40d287c3d906 Patch #716969: Detect thread creation failure. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28673 diff changeset	218
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20431 diff changeset	219 #if SIZEOF_PTHREAD_T <= SIZEOF_LONG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	220 return (long) th;
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20431 diff changeset	221 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	222 return (long) (long ) &th;
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20431 diff changeset	223 #endif
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	224 }
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	225
14144 31cda87e9ff4 This patch partly (some stuff went in already) ports Python to Monterey. Trent Mick <trentm@activestate.com> parents: 13658 diff changeset	226 /* XXX This implementation is considered (to quote Tim Peters) "inherently
31cda87e9ff4 This patch partly (some stuff went in already) ports Python to Monterey. Trent Mick <trentm@activestate.com> parents: 13658 diff changeset	227 hosed" because:
31611 0979fa062deb typo Skip Montanaro <skip@pobox.com> parents: 31470 diff changeset	228 - It does not guarantee the promise that a non-zero integer is returned.
14144 31cda87e9ff4 This patch partly (some stuff went in already) ports Python to Monterey. Trent Mick <trentm@activestate.com> parents: 13658 diff changeset	229 - The cast to long is inherently unsafe.
31cda87e9ff4 This patch partly (some stuff went in already) ports Python to Monterey. Trent Mick <trentm@activestate.com> parents: 13658 diff changeset	230 - It is not clear that the 'volatile' (for AIX?) and ugly casting in the
31cda87e9ff4 This patch partly (some stuff went in already) ports Python to Monterey. Trent Mick <trentm@activestate.com> parents: 13658 diff changeset	231 latter return statement (for Alpha OSF/1) are any longer necessary.
31cda87e9ff4 This patch partly (some stuff went in already) ports Python to Monterey. Trent Mick <trentm@activestate.com> parents: 13658 diff changeset	232 */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	233 long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	234 PyThread_get_thread_ident(void)
1651 7e5f97bab1e6 ceval.c: dict of local mapping is now a tuple Guido van Rossum <guido@python.org> parents: 1629 diff changeset	235 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	236 volatile pthread_t threadid;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	237 if (!initialized)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	238 PyThread_init_thread();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	239 /* Jump through some hoops for Alpha OSF/1 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	240 threadid = pthread_self();
14144 31cda87e9ff4 This patch partly (some stuff went in already) ports Python to Monterey. Trent Mick <trentm@activestate.com> parents: 13658 diff changeset	241 #if SIZEOF_PTHREAD_T <= SIZEOF_LONG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	242 return (long) threadid;
14144 31cda87e9ff4 This patch partly (some stuff went in already) ports Python to Monterey. Trent Mick <trentm@activestate.com> parents: 13658 diff changeset	243 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	244 return (long) (long ) &threadid;
14144 31cda87e9ff4 This patch partly (some stuff went in already) ports Python to Monterey. Trent Mick <trentm@activestate.com> parents: 13658 diff changeset	245 #endif
1651 7e5f97bab1e6 ceval.c: dict of local mapping is now a tuple Guido van Rossum <guido@python.org> parents: 1629 diff changeset	246 }
7e5f97bab1e6 ceval.c: dict of local mapping is now a tuple Guido van Rossum <guido@python.org> parents: 1629 diff changeset	247
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	248 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	249 PyThread_exit_thread(void)
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	250 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	251 dprintf(("PyThread_exit_thread called\n"));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	252 if (!initialized) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	253 exit(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	254 }
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	255 }
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	256
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	257 #ifdef USE_SEMAPHORES
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	258
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	259 /*
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	260 * Lock support.
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	261 */
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	262
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	263 PyThread_type_lock
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	264 PyThread_allocate_lock(void)
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	265 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	266 sem_t *lock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	267 int status, error = 0;
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	268
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	269 dprintf(("PyThread_allocate_lock called\n"));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	270 if (!initialized)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	271 PyThread_init_thread();
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	272
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	273 lock = (sem_t *)malloc(sizeof(sem_t));
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	274
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	275 if (lock) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	276 status = sem_init(lock,0,1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	277 CHECK_STATUS("sem_init");
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	278
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	279 if (error) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	280 free((void *)lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	281 lock = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	282 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	283 }
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	284
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	285 dprintf(("PyThread_allocate_lock() -> %p\n", lock));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	286 return (PyThread_type_lock)lock;
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	287 }
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	288
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	289 void
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	290 PyThread_free_lock(PyThread_type_lock lock)
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	291 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	292 sem_t thelock = (sem_t )lock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	293 int status, error = 0;
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	294
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	295 dprintf(("PyThread_free_lock(%p) called\n", lock));
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	296
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	297 if (!thelock)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	298 return;
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	299
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	300 status = sem_destroy(thelock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	301 CHECK_STATUS("sem_destroy");
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	302
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	303 free((void *)thelock);
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	304 }
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	305
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	306 /*
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	307 * As of February 2002, Cygwin thread implementations mistakenly report error
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	308 * codes in the return value of the sem_ calls (like the pthread_ functions).
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	309 * Correct implementations return -1 and put the code in errno. This supports
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	310 * either.
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	311 */
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	312 static int
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	313 fix_status(int status)
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	314 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	315 return (status == -1) ? errno : status;
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	316 }
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	317
60598 01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	318 int
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	319 PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds)
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	320 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	321 int success;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	322 sem_t thelock = (sem_t )lock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	323 int status, error = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	324 struct timespec ts;
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	325
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	326 dprintf(("PyThread_acquire_lock_timed(%p, %lld) called\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	327 lock, microseconds));
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	328
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	329 if (microseconds > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	330 MICROSECONDS_TO_TIMESPEC(microseconds, ts);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	331 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	332 if (microseconds > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	333 status = fix_status(sem_timedwait(thelock, &ts));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	334 else if (microseconds == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	335 status = fix_status(sem_trywait(thelock));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	336 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	337 status = fix_status(sem_wait(thelock));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	338 } while (status == EINTR); /* Retry if interrupted by a signal */
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	339
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	340 if (microseconds > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	341 if (status != ETIMEDOUT)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	342 CHECK_STATUS("sem_timedwait");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	343 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	344 else if (microseconds == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	345 if (status != EAGAIN)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	346 CHECK_STATUS("sem_trywait");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	347 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	348 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	349 CHECK_STATUS("sem_wait");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	350 }
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	351
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	352 success = (status == 0) ? 1 : 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	353
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	354 dprintf(("PyThread_acquire_lock_timed(%p, %lld) -> %d\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	355 lock, microseconds, success));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	356 return success;
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	357 }
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	358
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	359 int
60598 01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	360 PyThread_acquire_lock(PyThread_type_lock lock, int waitflag)
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	361 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	362 return PyThread_acquire_lock_timed(lock, waitflag ? -1 : 0);
60598 01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	363 }
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	364
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	365 void
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	366 PyThread_release_lock(PyThread_type_lock lock)
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	367 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	368 sem_t thelock = (sem_t )lock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	369 int status, error = 0;
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	370
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	371 dprintf(("PyThread_release_lock(%p) called\n", lock));
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	372
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	373 status = sem_post(thelock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	374 CHECK_STATUS("sem_post");
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	375 }
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	376
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	377 #else /* USE_SEMAPHORES */
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	378
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	379 /*
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	380 * Lock support.
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	381 */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	382 PyThread_type_lock
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	383 PyThread_allocate_lock(void)
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	384 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	385 pthread_lock *lock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	386 int status, error = 0;
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	387
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	388 dprintf(("PyThread_allocate_lock called\n"));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	389 if (!initialized)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	390 PyThread_init_thread();
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	391
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	392 lock = (pthread_lock *) malloc(sizeof(pthread_lock));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	393 if (lock) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	394 memset((void *)lock, '\0', sizeof(pthread_lock));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	395 lock->locked = 0;
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	396
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	397 status = pthread_mutex_init(&lock->mut,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	398 pthread_mutexattr_default);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	399 CHECK_STATUS("pthread_mutex_init");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	400 /* Mark the pthread mutex underlying a Python mutex as
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	401 pure happens-before. We can't simply mark the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	402 Python-level mutex as a mutex because it can be
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	403 acquired and released in different threads, which
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	404 will cause errors. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	405 _Py_ANNOTATE_PURE_HAPPENS_BEFORE_MUTEX(&lock->mut);
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	406
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	407 status = pthread_cond_init(&lock->lock_released,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	408 pthread_condattr_default);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	409 CHECK_STATUS("pthread_cond_init");
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	410
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	411 if (error) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	412 free((void *)lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	413 lock = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	414 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	415 }
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	416
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	417 dprintf(("PyThread_allocate_lock() -> %p\n", lock));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	418 return (PyThread_type_lock) lock;
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	419 }
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	420
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	421 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	422 PyThread_free_lock(PyThread_type_lock lock)
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	423 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	424 pthread_lock thelock = (pthread_lock )lock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	425 int status, error = 0;
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	426
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	427 dprintf(("PyThread_free_lock(%p) called\n", lock));
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	428
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	429 status = pthread_mutex_destroy( &thelock->mut );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	430 CHECK_STATUS("pthread_mutex_destroy");
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	431
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	432 status = pthread_cond_destroy( &thelock->lock_released );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	433 CHECK_STATUS("pthread_cond_destroy");
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	434
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	435 free((void *)thelock);
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	436 }
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	437
60598 01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	438 int
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	439 PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds)
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	440 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	441 int success;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	442 pthread_lock thelock = (pthread_lock )lock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	443 int status, error = 0;
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	444
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	445 dprintf(("PyThread_acquire_lock_timed(%p, %lld) called\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	446 lock, microseconds));
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	447
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	448 status = pthread_mutex_lock( &thelock->mut );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	449 CHECK_STATUS("pthread_mutex_lock[1]");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	450 success = thelock->locked == 0;
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	451
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	452 if (!success && microseconds != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	453 struct timespec ts;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	454 if (microseconds > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	455 MICROSECONDS_TO_TIMESPEC(microseconds, ts);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	456 /* continue trying until we get the lock */
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	457
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	458 /* mut must be locked by me -- part of the condition
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	459 * protocol */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	460 while (thelock->locked) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	461 if (microseconds > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	462 status = pthread_cond_timedwait(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	463 &thelock->lock_released,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	464 &thelock->mut, &ts);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	465 if (status == ETIMEDOUT)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	466 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	467 CHECK_STATUS("pthread_cond_timed_wait");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	468 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	469 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	470 status = pthread_cond_wait(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	471 &thelock->lock_released,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	472 &thelock->mut);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	473 CHECK_STATUS("pthread_cond_wait");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	474 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	475 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	476 success = (status == 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	477 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	478 if (success) thelock->locked = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	479 status = pthread_mutex_unlock( &thelock->mut );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	480 CHECK_STATUS("pthread_mutex_unlock[1]");
28673 c1ba50790c83 Patch #711835: Remove unnecessary lock operations. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 27320 diff changeset	481
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	482 if (error) success = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	483 dprintf(("PyThread_acquire_lock_timed(%p, %lld) -> %d\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	484 lock, microseconds, success));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	485 return success;
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	486 }
a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	487
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	488 int
60598 01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	489 PyThread_acquire_lock(PyThread_type_lock lock, int waitflag)
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	490 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	491 return PyThread_acquire_lock_timed(lock, waitflag ? -1 : 0);
60598 01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	492 }
01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59089 diff changeset	493
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	494 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	495 PyThread_release_lock(PyThread_type_lock lock)
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	496 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	497 pthread_lock thelock = (pthread_lock )lock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	498 int status, error = 0;
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	499
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	500 dprintf(("PyThread_release_lock(%p) called\n", lock));
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	501
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	502 status = pthread_mutex_lock( &thelock->mut );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	503 CHECK_STATUS("pthread_mutex_lock[3]");
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	504
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	505 thelock->locked = 0;
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	506
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	507 status = pthread_mutex_unlock( &thelock->mut );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	508 CHECK_STATUS("pthread_mutex_unlock[3]");
1629 4121afd76d73 Tim's changes; removed some remaining non-functional ifdefs Guido van Rossum <guido@python.org> parents: 1628 diff changeset	509
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	510 /* wake up someone (anyone, if any) waiting on the lock */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	511 status = pthread_cond_signal( &thelock->lock_released );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	512 CHECK_STATUS("pthread_cond_signal");
1628 a9dd2e1ea5c9 Split thread.c into a number of system-specific files. Guido van Rossum <guido@python.org> parents: diff changeset	513 }
22339 6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	514
6c3e32357d91 Patch #525532: Add support for POSIX semaphores. Martin v. Löwis <martin@v.loewis.de> parents: 21766 diff changeset	515 #endif /* USE_SEMAPHORES */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	516
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	517 /* set the thread stack size.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	518 * Return 0 if size is valid, -1 if size is invalid,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	519 * -2 if setting stack size is not supported.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	520 */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	521 static int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	522 _pythread_pthread_set_stacksize(size_t size)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	523 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	524 #if defined(THREAD_STACK_SIZE)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	525 pthread_attr_t attrs;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	526 size_t tss_min;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	527 int rc = 0;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	528 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	529
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	530 /* set to default */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	531 if (size == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	532 _pythread_stacksize = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	533 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	534 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	535
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	536 #if defined(THREAD_STACK_SIZE)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	537 #if defined(PTHREAD_STACK_MIN)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	538 tss_min = PTHREAD_STACK_MIN > THREAD_STACK_MIN ? PTHREAD_STACK_MIN
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	539 : THREAD_STACK_MIN;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	540 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	541 tss_min = THREAD_STACK_MIN;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	542 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	543 if (size >= tss_min) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	544 /* validate stack size by setting thread attribute */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	545 if (pthread_attr_init(&attrs) == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	546 rc = pthread_attr_setstacksize(&attrs, size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	547 pthread_attr_destroy(&attrs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	548 if (rc == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	549 _pythread_stacksize = size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	550 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	551 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	552 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	553 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	554 return -1;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	555 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	556 return -2;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	557 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	558 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	559
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	560 #define THREAD_SET_STACKSIZE(x) _pythread_pthread_set_stacksize(x)

Mercurial > cpython-lru_cache-weakref

annotate Python/thread_pthread.h @ 62570:32651ee779ed