cpython-lru_cache-weakref: Lib/threading.py annotate

annotate Lib/threading.py @ 71583:cdff35544530 2.7

Minor doc addition for clarity

author	Éric Araujo <merwok@netwok.org>
date	Fri, 27 May 2011 04:42:47 +0200
parents	b36cb4602e21
children	775319cebaa3

rev	line source
24833 ca58f5a4558b Docstring nits: The module is neither proposed nor new. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24830 diff changeset	1 """Thread module emulating a subset of Java's threading model."""
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	2
26905 7ea7637341d0 - prefer "import ... as" to "import / (assignments) / del" for most things Fred Drake <fdrake@acm.org> parents: 26883 diff changeset	3 import sys as _sys
7ea7637341d0 - prefer "import ... as" to "import / (assignments) / del" for most things Fred Drake <fdrake@acm.org> parents: 26883 diff changeset	4
7ea7637341d0 - prefer "import ... as" to "import / (assignments) / del" for most things Fred Drake <fdrake@acm.org> parents: 26883 diff changeset	5 try:
7ea7637341d0 - prefer "import ... as" to "import / (assignments) / del" for most things Fred Drake <fdrake@acm.org> parents: 26883 diff changeset	6 import thread
7ea7637341d0 - prefer "import ... as" to "import / (assignments) / del" for most things Fred Drake <fdrake@acm.org> parents: 26883 diff changeset	7 except ImportError:
7ea7637341d0 - prefer "import ... as" to "import / (assignments) / del" for most things Fred Drake <fdrake@acm.org> parents: 26883 diff changeset	8 del _sys.modules[__name__]
7ea7637341d0 - prefer "import ... as" to "import / (assignments) / del" for most things Fred Drake <fdrake@acm.org> parents: 26883 diff changeset	9 raise
7ea7637341d0 - prefer "import ... as" to "import / (assignments) / del" for most things Fred Drake <fdrake@acm.org> parents: 26883 diff changeset	10
46220 600f2ff8aa9e Block the sys.exc_clear -3 warning from threading.py. Jeffrey Yasskin <jyasskin@gmail.com> parents: 46182 diff changeset	11 import warnings
47601 8dc4312a2f75 add aliases to threading module Benjamin Peterson <benjamin@python.org> parents: 47598 diff changeset	12
26905 7ea7637341d0 - prefer "import ... as" to "import / (assignments) / del" for most things Fred Drake <fdrake@acm.org> parents: 26883 diff changeset	13 from time import time as _time, sleep as _sleep
30862 d45f8981fdea Add traceback.format_exc(). Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 29725 diff changeset	14 from traceback import format_exc as _format_exc
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: 30862 diff changeset	15 from collections import deque
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	16
48942 bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	17 # Note regarding PEP 8 compliant aliases
bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	18 # This threading model was originally inspired by Java, and inherited
bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	19 # the convention of camelCase function and method names from that
bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	20 # language. While those names are not in any imminent danger of being
bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	21 # deprecated, starting with Python 2.6, the module now provides a
bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	22 # PEP 8 compliant alias for any such method name.
bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	23 # Using the new PEP 8 compliant names also facilitates substitution
bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	24 # with the multiprocessing module, which doesn't provide the old
bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	25 # Java inspired names.
bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	26
bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	27
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	28 # Rename some stuff so "from threading import *" is safe
47606 696344ef8bc0 add old names back into __all__ Benjamin Peterson <benjamin@python.org> parents: 47601 diff changeset	29 __all__ = ['activeCount', 'active_count', 'Condition', 'currentThread',
696344ef8bc0 add old names back into __all__ Benjamin Peterson <benjamin@python.org> parents: 47601 diff changeset	30 'current_thread', 'enumerate', 'Event',
29676 052bfcbabb7b Provide dummy (do-nothing) settrace() and setprofile() functions until Tim Peters <tim.peters@gmail.com> parents: 28089 diff changeset	31 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Thread',
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	32 'Timer', 'setprofile', 'settrace', 'local', 'stack_size']
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	33
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	34 _start_new_thread = thread.start_new_thread
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	35 _allocate_lock = thread.allocate_lock
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	36 _get_ident = thread.get_ident
12813 f1f9c30a4156 patch from Charles Waldman-- Jeremy Hylton <jeremy@alum.mit.edu> parents: 11876 diff changeset	37 ThreadError = thread.error
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	38 del thread
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	39
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	40
46220 600f2ff8aa9e Block the sys.exc_clear -3 warning from threading.py. Jeffrey Yasskin <jyasskin@gmail.com> parents: 46182 diff changeset	41 # sys.exc_clear is used to work around the fact that except blocks
600f2ff8aa9e Block the sys.exc_clear -3 warning from threading.py. Jeffrey Yasskin <jyasskin@gmail.com> parents: 46182 diff changeset	42 # don't fully clear the exception until 3.0.
600f2ff8aa9e Block the sys.exc_clear -3 warning from threading.py. Jeffrey Yasskin <jyasskin@gmail.com> parents: 46182 diff changeset	43 warnings.filterwarnings('ignore', category=DeprecationWarning,
600f2ff8aa9e Block the sys.exc_clear -3 warning from threading.py. Jeffrey Yasskin <jyasskin@gmail.com> parents: 46182 diff changeset	44 module='threading', message='sys.exc_clear')
600f2ff8aa9e Block the sys.exc_clear -3 warning from threading.py. Jeffrey Yasskin <jyasskin@gmail.com> parents: 46182 diff changeset	45
29725 7d0af4561eed Make the classes exposed by threading.py new-style classes. This is Tim Peters <tim.peters@gmail.com> parents: 29724 diff changeset	46 # Debug support (adapted from ihooks.py).
7d0af4561eed Make the classes exposed by threading.py new-style classes. This is Tim Peters <tim.peters@gmail.com> parents: 29724 diff changeset	47 # All the major classes here derive from _Verbose. We force that to
7d0af4561eed Make the classes exposed by threading.py new-style classes. This is Tim Peters <tim.peters@gmail.com> parents: 29724 diff changeset	48 # be a new-style class so that all the major classes here are new-style.
7d0af4561eed Make the classes exposed by threading.py new-style classes. This is Tim Peters <tim.peters@gmail.com> parents: 29724 diff changeset	49 # This helps debugging (type(instance) is more revealing for instances
7d0af4561eed Make the classes exposed by threading.py new-style classes. This is Tim Peters <tim.peters@gmail.com> parents: 29724 diff changeset	50 # of new-style classes).
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	51
29724 3b7b4fd5f7ca Resolved minor XXX question in the obvious way. Tim Peters <tim.peters@gmail.com> parents: 29686 diff changeset	52 _VERBOSE = False
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	53
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	54 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	55
29725 7d0af4561eed Make the classes exposed by threading.py new-style classes. This is Tim Peters <tim.peters@gmail.com> parents: 29724 diff changeset	56 class _Verbose(object):
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	57
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	58 def __init__(self, verbose=None):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	59 if verbose is None:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	60 verbose = _VERBOSE
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	61 self.__verbose = verbose
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	62
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	63 def _note(self, format, *args):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	64 if self.__verbose:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	65 format = format % args
66991 341b93d83157 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60375 diff changeset	66 # Issue #4188: calling current_thread() can incur an infinite
341b93d83157 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60375 diff changeset	67 # recursion if it has to create a DummyThread on the fly.
341b93d83157 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60375 diff changeset	68 ident = _get_ident()
341b93d83157 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60375 diff changeset	69 try:
341b93d83157 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60375 diff changeset	70 name = _active[ident].name
341b93d83157 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60375 diff changeset	71 except KeyError:
341b93d83157 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60375 diff changeset	72 name = "<OS thread %d>" % ident
341b93d83157 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60375 diff changeset	73 format = "%s: %s\n" % (name, format)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	74 _sys.stderr.write(format)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	75
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	76 else:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	77 # Disable this when using "python -O"
29725 7d0af4561eed Make the classes exposed by threading.py new-style classes. This is Tim Peters <tim.peters@gmail.com> parents: 29724 diff changeset	78 class _Verbose(object):
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	79 def __init__(self, verbose=None):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	80 pass
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	81 def _note(self, *args):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	82 pass
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	83
29679 d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	84 # Support for profile and trace hooks
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	85
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	86 _profile_hook = None
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	87 _trace_hook = None
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	88
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	89 def setprofile(func):
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	90 global _profile_hook
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	91 _profile_hook = func
29686 371092ce5c2b Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 29683 diff changeset	92
29679 d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	93 def settrace(func):
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	94 global _trace_hook
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	95 _trace_hook = func
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	96
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	97 # Synchronization classes
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	98
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	99 Lock = _allocate_lock
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	100
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	101 def RLock(args, *kwargs):
28089 14f65d661084 Get rid of many apply() calls. Guido van Rossum <guido@python.org> parents: 26905 diff changeset	102 return _RLock(args, *kwargs)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	103
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	104 class _RLock(_Verbose):
15873 3dd217fbdd59 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15586 diff changeset	105
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	106 def __init__(self, verbose=None):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	107 _Verbose.__init__(self, verbose)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	108 self.__block = _allocate_lock()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	109 self.__owner = None
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	110 self.__count = 0
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	111
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	112 def __repr__(self):
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	113 owner = self.__owner
57159 0eb56a8e6262 Merged revisions 76137,76172 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57119 diff changeset	114 try:
0eb56a8e6262 Merged revisions 76137,76172 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57119 diff changeset	115 owner = _active[owner].name
0eb56a8e6262 Merged revisions 76137,76172 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57119 diff changeset	116 except KeyError:
0eb56a8e6262 Merged revisions 76137,76172 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57119 diff changeset	117 pass
0eb56a8e6262 Merged revisions 76137,76172 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57119 diff changeset	118 return "<%s owner=%r count=%d>" % (
0eb56a8e6262 Merged revisions 76137,76172 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57119 diff changeset	119 self.__class__.__name__, owner, self.__count)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	120
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	121 def acquire(self, blocking=1):
57159 0eb56a8e6262 Merged revisions 76137,76172 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57119 diff changeset	122 me = _get_ident()
0eb56a8e6262 Merged revisions 76137,76172 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57119 diff changeset	123 if self.__owner == me:
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	124 self.__count = self.__count + 1
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	125 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	126 self._note("%s.acquire(%s): recursive success", self, blocking)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	127 return 1
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	128 rc = self.__block.acquire(blocking)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	129 if rc:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	130 self.__owner = me
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	131 self.__count = 1
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	132 if __debug__:
34512 cb7896d77de5 Fixed typo in verbose output. Brett Cannon <bcannon@gmail.com> parents: 34363 diff changeset	133 self._note("%s.acquire(%s): initial success", self, blocking)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	134 else:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	135 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	136 self._note("%s.acquire(%s): failure", self, blocking)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	137 return rc
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	138
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	139 __enter__ = acquire
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	140
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	141 def release(self):
57159 0eb56a8e6262 Merged revisions 76137,76172 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57119 diff changeset	142 if self.__owner != _get_ident():
56830 97d7cd365dd5 Merged revisions 73206,73232,73299,73683,74020,74185,74544,74643,74647,74817,74838-74839,74865,74946,75402,75459,75604,75696 via svnmerge from Georg Brandl <georg@python.org> parents: 52596 diff changeset	143 raise RuntimeError("cannot release un-acquired lock")
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	144 self.__count = count = self.__count - 1
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	145 if not count:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	146 self.__owner = None
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	147 self.__block.release()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	148 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	149 self._note("%s.release(): final release", self)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	150 else:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	151 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	152 self._note("%s.release(): non-final release", self)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	153
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	154 def __exit__(self, t, v, tb):
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	155 self.release()
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	156
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	157 # Internal methods used by condition variables
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	158
48131 5279d7961093 Remove a tuple unpacking in a parameter list to suppress the SyntaxWarning with Brett Cannon <bcannon@gmail.com> parents: 47985 diff changeset	159 def _acquire_restore(self, count_owner):
5279d7961093 Remove a tuple unpacking in a parameter list to suppress the SyntaxWarning with Brett Cannon <bcannon@gmail.com> parents: 47985 diff changeset	160 count, owner = count_owner
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	161 self.__block.acquire()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	162 self.__count = count
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	163 self.__owner = owner
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	164 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	165 self._note("%s._acquire_restore()", self)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	166
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	167 def _release_save(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	168 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	169 self._note("%s._release_save()", self)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	170 count = self.__count
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	171 self.__count = 0
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	172 owner = self.__owner
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	173 self.__owner = None
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	174 self.__block.release()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	175 return (count, owner)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	176
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	177 def _is_owned(self):
57159 0eb56a8e6262 Merged revisions 76137,76172 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57119 diff changeset	178 return self.__owner == _get_ident()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	179
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	180
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	181 def Condition(args, *kwargs):
28089 14f65d661084 Get rid of many apply() calls. Guido van Rossum <guido@python.org> parents: 26905 diff changeset	182 return _Condition(args, *kwargs)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	183
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	184 class _Condition(_Verbose):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	185
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	186 def __init__(self, lock=None, verbose=None):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	187 _Verbose.__init__(self, verbose)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	188 if lock is None:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	189 lock = RLock()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	190 self.__lock = lock
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	191 # Export the lock's acquire() and release() methods
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	192 self.acquire = lock.acquire
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	193 self.release = lock.release
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	194 # If the lock defines _release_save() and/or _acquire_restore(),
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	195 # these override the default implementations (which just call
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	196 # release() and acquire() on the lock). Ditto for _is_owned().
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	197 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	198 self._release_save = lock._release_save
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	199 except AttributeError:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	200 pass
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	201 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	202 self._acquire_restore = lock._acquire_restore
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	203 except AttributeError:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	204 pass
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	205 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	206 self._is_owned = lock._is_owned
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	207 except AttributeError:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	208 pass
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	209 self.__waiters = []
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	210
38084 a812d0fae74a Get rid of __context__, per the latest changes to PEP 343 and python-dev Guido van Rossum <guido@python.org> parents: 37983 diff changeset	211 def __enter__(self):
a812d0fae74a Get rid of __context__, per the latest changes to PEP 343 and python-dev Guido van Rossum <guido@python.org> parents: 37983 diff changeset	212 return self.__lock.__enter__()
a812d0fae74a Get rid of __context__, per the latest changes to PEP 343 and python-dev Guido van Rossum <guido@python.org> parents: 37983 diff changeset	213
a812d0fae74a Get rid of __context__, per the latest changes to PEP 343 and python-dev Guido van Rossum <guido@python.org> parents: 37983 diff changeset	214 def __exit__(self, *args):
a812d0fae74a Get rid of __context__, per the latest changes to PEP 343 and python-dev Guido van Rossum <guido@python.org> parents: 37983 diff changeset	215 return self.__lock.__exit__(*args)
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	216
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	217 def __repr__(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	218 return "<Condition(%s, %d)>" % (self.__lock, len(self.__waiters))
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	219
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	220 def _release_save(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	221 self.__lock.release() # No state to save
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	222
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	223 def _acquire_restore(self, x):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	224 self.__lock.acquire() # Ignore saved state
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	225
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	226 def _is_owned(self):
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	227 # Return True if lock is owned by current_thread.
24827 e5a07cc81559 Explain a minor mystery. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24058 diff changeset	228 # This method is called only if __lock doesn't have _is_owned().
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	229 if self.__lock.acquire(0):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	230 self.__lock.release()
22830 a9dd5e6d6805 Convert a pile of obvious "yes/no" functions to return bool. Tim Peters <tim.peters@gmail.com> parents: 21981 diff changeset	231 return False
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	232 else:
22830 a9dd5e6d6805 Convert a pile of obvious "yes/no" functions to return bool. Tim Peters <tim.peters@gmail.com> parents: 21981 diff changeset	233 return True
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	234
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	235 def wait(self, timeout=None):
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	236 if not self._is_owned():
56830 97d7cd365dd5 Merged revisions 73206,73232,73299,73683,74020,74185,74544,74643,74647,74817,74838-74839,74865,74946,75402,75459,75604,75696 via svnmerge from Georg Brandl <georg@python.org> parents: 52596 diff changeset	237 raise RuntimeError("cannot wait on un-acquired lock")
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	238 waiter = _allocate_lock()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	239 waiter.acquire()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	240 self.__waiters.append(waiter)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	241 saved_state = self._release_save()
17303 836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	242 try: # restore state no matter what (e.g., KeyboardInterrupt)
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	243 if timeout is None:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	244 waiter.acquire()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	245 if __debug__:
17303 836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	246 self._note("%s.wait(): got it", self)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	247 else:
19184 2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	248 # Balancing act: We can't afford a pure busy loop, so we
2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	249 # have to sleep; but if we sleep the whole timeout time,
2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	250 # we'll be unresponsive. The scheme here sleeps very
2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	251 # little at first, longer as time goes on, but never longer
2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	252 # than 20 times per second (or the timeout time remaining).
17303 836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	253 endtime = _time() + timeout
19184 2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	254 delay = 0.0005 # 500 us -> initial delay of 1 ms
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	255 while True:
17303 836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	256 gotit = waiter.acquire(0)
19184 2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	257 if gotit:
17303 836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	258 break
19184 2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	259 remaining = endtime - _time()
2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	260 if remaining <= 0:
2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	261 break
2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	262 delay = min(delay * 2, remaining, .05)
17303 836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	263 _sleep(delay)
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	264 if not gotit:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	265 if __debug__:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	266 self._note("%s.wait(%s): timed out", self, timeout)
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	267 try:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	268 self.__waiters.remove(waiter)
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	269 except ValueError:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	270 pass
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	271 else:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	272 if __debug__:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	273 self._note("%s.wait(%s): got it", self, timeout)
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	274 finally:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	275 self._acquire_restore(saved_state)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	276
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	277 def notify(self, n=1):
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	278 if not self._is_owned():
56830 97d7cd365dd5 Merged revisions 73206,73232,73299,73683,74020,74185,74544,74643,74647,74817,74838-74839,74865,74946,75402,75459,75604,75696 via svnmerge from Georg Brandl <georg@python.org> parents: 52596 diff changeset	279 raise RuntimeError("cannot notify on un-acquired lock")
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	280 __waiters = self.__waiters
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	281 waiters = __waiters[:n]
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	282 if not waiters:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	283 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	284 self._note("%s.notify(): no waiters", self)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	285 return
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	286 self._note("%s.notify(): notifying %d waiter%s", self, n,
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	287 n!=1 and "s" or "")
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	288 for waiter in waiters:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	289 waiter.release()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	290 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	291 __waiters.remove(waiter)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	292 except ValueError:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	293 pass
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	294
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	295 def notifyAll(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	296 self.notify(len(self.__waiters))
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	297
48942 bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	298 notify_all = notifyAll
47601 8dc4312a2f75 add aliases to threading module Benjamin Peterson <benjamin@python.org> parents: 47598 diff changeset	299
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	300
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	301 def Semaphore(args, *kwargs):
28089 14f65d661084 Get rid of many apply() calls. Guido van Rossum <guido@python.org> parents: 26905 diff changeset	302 return _Semaphore(args, *kwargs)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	303
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	304 class _Semaphore(_Verbose):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	305
11876 c27d3e8c45c4 Fix a typo in a comment Andrew M. Kuchling <amk@amk.ca> parents: 11707 diff changeset	306 # After Tim Peters' semaphore class, but not quite the same (no maximum)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	307
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	308 def __init__(self, value=1, verbose=None):
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	309 if value < 0:
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	310 raise ValueError("semaphore initial value must be >= 0")
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	311 _Verbose.__init__(self, verbose)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	312 self.__cond = Condition(Lock())
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	313 self.__value = value
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	314
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	315 def acquire(self, blocking=1):
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	316 rc = False
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	317 self.__cond.acquire()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	318 while self.__value == 0:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	319 if not blocking:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	320 break
19377 6386f01f2401 add debug calls to self._note for the Semaphore class. This closes bug Skip Montanaro <skip@pobox.com> parents: 19210 diff changeset	321 if __debug__:
6386f01f2401 add debug calls to self._note for the Semaphore class. This closes bug Skip Montanaro <skip@pobox.com> parents: 19210 diff changeset	322 self._note("%s.acquire(%s): blocked waiting, value=%s",
6386f01f2401 add debug calls to self._note for the Semaphore class. This closes bug Skip Montanaro <skip@pobox.com> parents: 19210 diff changeset	323 self, blocking, self.__value)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	324 self.__cond.wait()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	325 else:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	326 self.__value = self.__value - 1
19377 6386f01f2401 add debug calls to self._note for the Semaphore class. This closes bug Skip Montanaro <skip@pobox.com> parents: 19210 diff changeset	327 if __debug__:
19379 2a083e050617 of course I muffed it separating the notes code from the initial_value Skip Montanaro <skip@pobox.com> parents: 19377 diff changeset	328 self._note("%s.acquire: success, value=%s",
2a083e050617 of course I muffed it separating the notes code from the initial_value Skip Montanaro <skip@pobox.com> parents: 19377 diff changeset	329 self, self.__value)
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	330 rc = True
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	331 self.__cond.release()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	332 return rc
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	333
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	334 __enter__ = acquire
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	335
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	336 def release(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	337 self.__cond.acquire()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	338 self.__value = self.__value + 1
19377 6386f01f2401 add debug calls to self._note for the Semaphore class. This closes bug Skip Montanaro <skip@pobox.com> parents: 19210 diff changeset	339 if __debug__:
19379 2a083e050617 of course I muffed it separating the notes code from the initial_value Skip Montanaro <skip@pobox.com> parents: 19377 diff changeset	340 self._note("%s.release: success, value=%s",
2a083e050617 of course I muffed it separating the notes code from the initial_value Skip Montanaro <skip@pobox.com> parents: 19377 diff changeset	341 self, self.__value)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	342 self.__cond.notify()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	343 self.__cond.release()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	344
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	345 def __exit__(self, t, v, tb):
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	346 self.release()
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	347
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	348
19404 6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	349 def BoundedSemaphore(args, *kwargs):
28089 14f65d661084 Get rid of many apply() calls. Guido van Rossum <guido@python.org> parents: 26905 diff changeset	350 return _BoundedSemaphore(args, *kwargs)
19404 6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	351
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	352 class _BoundedSemaphore(_Semaphore):
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	353 """Semaphore that checks that # releases is <= # acquires"""
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	354 def __init__(self, value=1, verbose=None):
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	355 _Semaphore.__init__(self, value, verbose)
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	356 self._initial_value = value
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	357
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	358 def release(self):
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	359 if self._Semaphore__value >= self._initial_value:
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	360 raise ValueError, "Semaphore released too many times"
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	361 return _Semaphore.release(self)
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	362
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	363
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	364 def Event(args, *kwargs):
28089 14f65d661084 Get rid of many apply() calls. Guido van Rossum <guido@python.org> parents: 26905 diff changeset	365 return _Event(args, *kwargs)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	366
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	367 class _Event(_Verbose):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	368
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	369 # After Tim Peters' event class (without is_posted())
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	370
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	371 def __init__(self, verbose=None):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	372 _Verbose.__init__(self, verbose)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	373 self.__cond = Condition(Lock())
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	374 self.__flag = False
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	375
67341 3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	376 def _reset_internal_locks(self):
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	377 # private! called by Thread._reset_internal_locks by _after_fork()
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	378 self.__cond.__init__()
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	379
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	380 def isSet(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	381 return self.__flag
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	382
48942 bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	383 is_set = isSet
47601 8dc4312a2f75 add aliases to threading module Benjamin Peterson <benjamin@python.org> parents: 47598 diff changeset	384
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	385 def set(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	386 self.__cond.acquire()
26326 2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	387 try:
2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	388 self.__flag = True
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	389 self.__cond.notify_all()
26326 2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	390 finally:
2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	391 self.__cond.release()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	392
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	393 def clear(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	394 self.__cond.acquire()
26326 2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	395 try:
2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	396 self.__flag = False
2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	397 finally:
2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	398 self.__cond.release()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	399
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	400 def wait(self, timeout=None):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	401 self.__cond.acquire()
26326 2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	402 try:
2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	403 if not self.__flag:
2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	404 self.__cond.wait(timeout)
52579 b5aa8aa78c0f #1674032: return value of flag from Event.wait(). OKed by Guido. Georg Brandl <georg@python.org> parents: 49059 diff changeset	405 return self.__flag
26326 2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	406 finally:
2b0e815c0b30 The _Event class should be more careful with releasing its lock when Guido van Rossum <guido@python.org> parents: 24833 diff changeset	407 self.__cond.release()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	408
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	409 # Helper to generate new thread names
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	410 _counter = 0
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	411 def _newname(template="Thread-%d"):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	412 global _counter
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	413 _counter = _counter + 1
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	414 return template % _counter
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	415
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	416 # Active thread administration
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	417 _active_limbo_lock = _allocate_lock()
34363 35f31790c6f9 threading._DummyThread.__init__(): document obscure new code. Tim Peters <tim.peters@gmail.com> parents: 34361 diff changeset	418 _active = {} # maps thread id to Thread object
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	419 _limbo = {}
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	420
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	421
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	422 # Main class for threads
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	423
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	424 class Thread(_Verbose):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	425
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	426 __initialized = False
32475 796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	427 # Need to store a reference to sys.exc_info for printing
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	428 # out exceptions when a thread tries to use a global var. during interp.
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	429 # shutdown and thus raises an exception about trying to perform some
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	430 # operation on/with a NoneType
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	431 __exc_info = _sys.exc_info
46146 10a39a662e69 Kill a race in test_threading in which the exception info in a thread finishing Jeffrey Yasskin <jyasskin@gmail.com> parents: 45545 diff changeset	432 # Keep sys.exc_clear too to clear the exception just before
10a39a662e69 Kill a race in test_threading in which the exception info in a thread finishing Jeffrey Yasskin <jyasskin@gmail.com> parents: 45545 diff changeset	433 # allowing .join() to return.
10a39a662e69 Kill a race in test_threading in which the exception info in a thread finishing Jeffrey Yasskin <jyasskin@gmail.com> parents: 45545 diff changeset	434 __exc_clear = _sys.exc_clear
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	435
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	436 def __init__(self, group=None, target=None, name=None,
35236 d0c6965b525e bug [ 1238170 ] threading.Thread uses {} as default argument Georg Brandl <georg@python.org> parents: 34512 diff changeset	437 args=(), kwargs=None, verbose=None):
8474 049aa3a8a172 Get rid of tabnanny's last complaints. Guido van Rossum <guido@python.org> parents: 8454 diff changeset	438 assert group is None, "group argument must be None for now"
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	439 _Verbose.__init__(self, verbose)
35236 d0c6965b525e bug [ 1238170 ] threading.Thread uses {} as default argument Georg Brandl <georg@python.org> parents: 34512 diff changeset	440 if kwargs is None:
d0c6965b525e bug [ 1238170 ] threading.Thread uses {} as default argument Georg Brandl <georg@python.org> parents: 34512 diff changeset	441 kwargs = {}
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	442 self.__target = target
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	443 self.__name = str(name or _newname())
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	444 self.__args = args
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	445 self.__kwargs = kwargs
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	446 self.__daemonic = self._set_daemon()
47438 7eaaad09b6cd Adds a Thread.getIdent() method to provide the _get_ident() value for Gregory P. Smith <greg@mad-scientist.com> parents: 46280 diff changeset	447 self.__ident = None
45545 3e435a211356 Thread.start() used sleep(0.000001) to make sure it didn't return before the Jeffrey Yasskin <jyasskin@gmail.com> parents: 45478 diff changeset	448 self.__started = Event()
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	449 self.__stopped = False
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	450 self.__block = Condition(Lock())
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	451 self.__initialized = True
32475 796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	452 # sys.stderr is not stored in the class like
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	453 # sys.exc_info since it can be changed between instances
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	454 self.__stderr = _sys.stderr
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	455
67341 3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	456 def _reset_internal_locks(self):
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	457 # private! Called by _after_fork() to reset our internal locks as
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	458 # they may be in an invalid state leading to a deadlock or crash.
67356 a6bc497b1962 backport fix from r87741 related to the issue6643 fix in r87727. Gregory P. Smith <greg@mad-scientist.com> parents: 67341 diff changeset	459 if hasattr(self, '_Thread__block'): # DummyThread deletes self.__block
a6bc497b1962 backport fix from r87741 related to the issue6643 fix in r87727. Gregory P. Smith <greg@mad-scientist.com> parents: 67341 diff changeset	460 self.__block.__init__()
67341 3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	461 self.__started._reset_internal_locks()
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	462
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	463 @property
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	464 def _block(self):
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	465 # used by a unittest
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	466 return self.__block
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	467
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	468 def _set_daemon(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	469 # Overridden in _MainThread and _DummyThread
48288 e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	470 return current_thread().daemon
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	471
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	472 def __repr__(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	473 assert self.__initialized, "Thread.__init__() was not called"
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	474 status = "initial"
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	475 if self.__started.is_set():
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	476 status = "started"
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	477 if self.__stopped:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	478 status = "stopped"
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	479 if self.__daemonic:
47438 7eaaad09b6cd Adds a Thread.getIdent() method to provide the _get_ident() value for Gregory P. Smith <greg@mad-scientist.com> parents: 46280 diff changeset	480 status += " daemon"
7eaaad09b6cd Adds a Thread.getIdent() method to provide the _get_ident() value for Gregory P. Smith <greg@mad-scientist.com> parents: 46280 diff changeset	481 if self.__ident is not None:
7eaaad09b6cd Adds a Thread.getIdent() method to provide the _get_ident() value for Gregory P. Smith <greg@mad-scientist.com> parents: 46280 diff changeset	482 status += " %s" % self.__ident
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	483 return "<%s(%s, %s)>" % (self.__class__.__name__, self.__name, status)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	484
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	485 def start(self):
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	486 if not self.__initialized:
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	487 raise RuntimeError("thread.__init__() not called")
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	488 if self.__started.is_set():
60375 922079f724a6 Fix Issue8262 - changing RuntimeError wording to "Threads can only be started once" Senthil Kumaran <orsenthil@gmail.com> parents: 59200 diff changeset	489 raise RuntimeError("threads can only be started once")
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	490 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	491 self._note("%s.start(): starting thread", self)
52590 5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	492 with _active_limbo_lock:
5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	493 _limbo[self] = self
59201 2cdec848b74c Merged revisions 78517 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57159 diff changeset	494 try:
2cdec848b74c Merged revisions 78517 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57159 diff changeset	495 _start_new_thread(self.__bootstrap, ())
2cdec848b74c Merged revisions 78517 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57159 diff changeset	496 except Exception:
2cdec848b74c Merged revisions 78517 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57159 diff changeset	497 with _active_limbo_lock:
2cdec848b74c Merged revisions 78517 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57159 diff changeset	498 del _limbo[self]
2cdec848b74c Merged revisions 78517 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57159 diff changeset	499 raise
45545 3e435a211356 Thread.start() used sleep(0.000001) to make sure it didn't return before the Jeffrey Yasskin <jyasskin@gmail.com> parents: 45478 diff changeset	500 self.__started.wait()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	501
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	502 def run(self):
45478 9f183ae3458b Followup to r61011: Also avoid the reference cycle when the Thread's target Jeffrey Yasskin <jyasskin@gmail.com> parents: 45477 diff changeset	503 try:
9f183ae3458b Followup to r61011: Also avoid the reference cycle when the Thread's target Jeffrey Yasskin <jyasskin@gmail.com> parents: 45477 diff changeset	504 if self.__target:
9f183ae3458b Followup to r61011: Also avoid the reference cycle when the Thread's target Jeffrey Yasskin <jyasskin@gmail.com> parents: 45477 diff changeset	505 self.__target(self.__args, *self.__kwargs)
9f183ae3458b Followup to r61011: Also avoid the reference cycle when the Thread's target Jeffrey Yasskin <jyasskin@gmail.com> parents: 45477 diff changeset	506 finally:
9f183ae3458b Followup to r61011: Also avoid the reference cycle when the Thread's target Jeffrey Yasskin <jyasskin@gmail.com> parents: 45477 diff changeset	507 # Avoid a refcycle if the thread is running a function with
9f183ae3458b Followup to r61011: Also avoid the reference cycle when the Thread's target Jeffrey Yasskin <jyasskin@gmail.com> parents: 45477 diff changeset	508 # an argument that has a member that points to the thread.
9f183ae3458b Followup to r61011: Also avoid the reference cycle when the Thread's target Jeffrey Yasskin <jyasskin@gmail.com> parents: 45477 diff changeset	509 del self.__target, self.__args, self.__kwargs
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	510
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	511 def __bootstrap(self):
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	512 # Wrapper around the real bootstrap code that ignores
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	513 # exceptions during interpreter cleanup. Those typically
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	514 # happen when a daemon thread wakes up at an unfortunate
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	515 # moment, finds the world around it destroyed, and raises some
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	516 # random exception *** while trying to report the exception in
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	517 # __bootstrap_inner() below ***. Those random exceptions
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	518 # don't help anybody, and they confuse users, so we suppress
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	519 # them. We suppress them only when it appears that the world
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	520 # indeed has already been destroyed, so that exceptions in
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	521 # __bootstrap_inner() during normal business hours are properly
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	522 # reported. Also, we only suppress them for daemonic threads;
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	523 # if a non-daemonic encounters this, something else is wrong.
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	524 try:
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	525 self.__bootstrap_inner()
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	526 except:
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	527 if self.__daemonic and _sys is None:
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	528 return
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	529 raise
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	530
52596 21ba0b3fe819 Merged revisions 70897 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49059 diff changeset	531 def _set_ident(self):
21ba0b3fe819 Merged revisions 70897 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49059 diff changeset	532 self.__ident = _get_ident()
21ba0b3fe819 Merged revisions 70897 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49059 diff changeset	533
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	534 def __bootstrap_inner(self):
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	535 try:
52596 21ba0b3fe819 Merged revisions 70897 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49059 diff changeset	536 self._set_ident()
45545 3e435a211356 Thread.start() used sleep(0.000001) to make sure it didn't return before the Jeffrey Yasskin <jyasskin@gmail.com> parents: 45478 diff changeset	537 self.__started.set()
52590 5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	538 with _active_limbo_lock:
5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	539 _active[self.__ident] = self
5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	540 del _limbo[self]
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	541 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	542 self._note("%s.__bootstrap(): thread started", self)
29679 d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	543
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	544 if _trace_hook:
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	545 self._note("%s.__bootstrap(): registering trace hook", self)
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	546 _sys.settrace(_trace_hook)
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	547 if _profile_hook:
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	548 self._note("%s.__bootstrap(): registering profile hook", self)
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	549 _sys.setprofile(_profile_hook)
29686 371092ce5c2b Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 29683 diff changeset	550
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	551 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	552 self.run()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	553 except SystemExit:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	554 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	555 self._note("%s.__bootstrap(): raised SystemExit", self)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	556 except:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	557 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	558 self._note("%s.__bootstrap(): unhandled exception", self)
32475 796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	559 # If sys.stderr is no more (most likely from interpreter
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	560 # shutdown) use self.__stderr. Otherwise still use sys (as in
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	561 # _sys) in case sys.stderr was redefined since the creation of
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	562 # self.
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	563 if _sys:
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	564 _sys.stderr.write("Exception in thread %s:\n%s\n" %
48830 f970a4f7560f fix a few get_name() calls and turn then to .name Benjamin Peterson <benjamin@python.org> parents: 48295 diff changeset	565 (self.name, _format_exc()))
32475 796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	566 else:
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	567 # Do the best job possible w/o a huge amt. of code to
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	568 # approximate a traceback (code ideas from
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	569 # Lib/traceback.py)
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	570 exc_type, exc_value, exc_tb = self.__exc_info()
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	571 try:
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	572 print>>self.__stderr, (
48830 f970a4f7560f fix a few get_name() calls and turn then to .name Benjamin Peterson <benjamin@python.org> parents: 48295 diff changeset	573 "Exception in thread " + self.name +
32475 796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	574 " (most likely raised during interpreter shutdown):")
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	575 print>>self.__stderr, (
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	576 "Traceback (most recent call last):")
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	577 while exc_tb:
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	578 print>>self.__stderr, (
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	579 ' File "%s", line %s, in %s' %
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	580 (exc_tb.tb_frame.f_code.co_filename,
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	581 exc_tb.tb_lineno,
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	582 exc_tb.tb_frame.f_code.co_name))
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	583 exc_tb = exc_tb.tb_next
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	584 print>>self.__stderr, ("%s: %s" % (exc_type, exc_value))
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	585 # Make sure that exc_tb gets deleted since it is a memory
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	586 # hog; deleting everything else is just for thoroughness
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	587 finally:
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	588 del exc_type, exc_value, exc_tb
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	589 else:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	590 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	591 self._note("%s.__bootstrap(): normal return", self)
46146 10a39a662e69 Kill a race in test_threading in which the exception info in a thread finishing Jeffrey Yasskin <jyasskin@gmail.com> parents: 45545 diff changeset	592 finally:
10a39a662e69 Kill a race in test_threading in which the exception info in a thread finishing Jeffrey Yasskin <jyasskin@gmail.com> parents: 45545 diff changeset	593 # Prevent a race in
10a39a662e69 Kill a race in test_threading in which the exception info in a thread finishing Jeffrey Yasskin <jyasskin@gmail.com> parents: 45545 diff changeset	594 # test_threading.test_no_refcycle_through_target when
10a39a662e69 Kill a race in test_threading in which the exception info in a thread finishing Jeffrey Yasskin <jyasskin@gmail.com> parents: 45545 diff changeset	595 # the exception keeps the target alive past when we
10a39a662e69 Kill a race in test_threading in which the exception info in a thread finishing Jeffrey Yasskin <jyasskin@gmail.com> parents: 45545 diff changeset	596 # assert that it's dead.
46182 fe53d1a36ef6 Revert my experiment. I found one reason of failures in test_logging. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46179 diff changeset	597 self.__exc_clear()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	598 finally:
44870 fe7d423474de - Fix Issue #1703448: A joined thread could show up in the Gregory P. Smith <greg@mad-scientist.com> parents: 44869 diff changeset	599 with _active_limbo_lock:
44871 ffacb44673ea Backport of r60190: Gregory P. Smith <greg@mad-scientist.com> parents: 44481 diff changeset	600 self.__stop()
ffacb44673ea Backport of r60190: Gregory P. Smith <greg@mad-scientist.com> parents: 44481 diff changeset	601 try:
ffacb44673ea Backport of r60190: Gregory P. Smith <greg@mad-scientist.com> parents: 44481 diff changeset	602 # We don't call self.__delete() because it also
ffacb44673ea Backport of r60190: Gregory P. Smith <greg@mad-scientist.com> parents: 44481 diff changeset	603 # grabs _active_limbo_lock.
ffacb44673ea Backport of r60190: Gregory P. Smith <greg@mad-scientist.com> parents: 44481 diff changeset	604 del _active[_get_ident()]
ffacb44673ea Backport of r60190: Gregory P. Smith <greg@mad-scientist.com> parents: 44481 diff changeset	605 except:
ffacb44673ea Backport of r60190: Gregory P. Smith <greg@mad-scientist.com> parents: 44481 diff changeset	606 pass
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	607
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	608 def __stop(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	609 self.__block.acquire()
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	610 self.__stopped = True
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	611 self.__block.notify_all()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	612 self.__block.release()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	613
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	614 def __delete(self):
32778 7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	615 "Remove current thread from the dict of currently running threads."
32774 8a91cd7d7e82 Fix bug where a KeyError was raised if -O was being used for the interpreter Brett Cannon <bcannon@gmail.com> parents: 32673 diff changeset	616
32778 7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	617 # Notes about running with dummy_thread:
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	618 #
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	619 # Must take care to not raise an exception if dummy_thread is being
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	620 # used (and thus this module is being used as an instance of
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	621 # dummy_threading). dummy_thread.get_ident() always returns -1 since
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	622 # there is only one thread if dummy_thread is being used. Thus
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	623 # len(_active) is always <= 1 here, and any Thread instance created
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	624 # overwrites the (if any) thread currently registered in _active.
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	625 #
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	626 # An instance of _MainThread is always created by 'threading'. This
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	627 # gets overwritten the instant an instance of Thread is created; both
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	628 # threads return -1 from dummy_thread.get_ident() and thus have the
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	629 # same key in the dict. So when the _MainThread instance created by
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	630 # 'threading' tries to clean itself up when atexit calls this method
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	631 # it gets a KeyError if another Thread instance was created.
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	632 #
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	633 # This all means that KeyError from trying to delete something from
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	634 # _active if dummy_threading is being used is a red herring. But
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	635 # since it isn't if dummy_threading is not being used then don't
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	636 # hide the exception.
32774 8a91cd7d7e82 Fix bug where a KeyError was raised if -O was being used for the interpreter Brett Cannon <bcannon@gmail.com> parents: 32673 diff changeset	637
32778 7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	638 try:
46280 76f577a9ec03 #1733757: the interpreter would hang on shutdown, if the function set by sys.settrace Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46220 diff changeset	639 with _active_limbo_lock:
32774 8a91cd7d7e82 Fix bug where a KeyError was raised if -O was being used for the interpreter Brett Cannon <bcannon@gmail.com> parents: 32673 diff changeset	640 del _active[_get_ident()]
46280 76f577a9ec03 #1733757: the interpreter would hang on shutdown, if the function set by sys.settrace Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46220 diff changeset	641 # There must not be any python code between the previous line
76f577a9ec03 #1733757: the interpreter would hang on shutdown, if the function set by sys.settrace Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46220 diff changeset	642 # and after the lock is released. Otherwise a tracing function
76f577a9ec03 #1733757: the interpreter would hang on shutdown, if the function set by sys.settrace Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46220 diff changeset	643 # could try to acquire the lock again in the same thread, (in
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	644 # current_thread()), and would block.
46280 76f577a9ec03 #1733757: the interpreter would hang on shutdown, if the function set by sys.settrace Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46220 diff changeset	645 except KeyError:
76f577a9ec03 #1733757: the interpreter would hang on shutdown, if the function set by sys.settrace Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46220 diff changeset	646 if 'dummy_threading' not in _sys.modules:
76f577a9ec03 #1733757: the interpreter would hang on shutdown, if the function set by sys.settrace Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46220 diff changeset	647 raise
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	648
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	649 def join(self, timeout=None):
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	650 if not self.__initialized:
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	651 raise RuntimeError("Thread.__init__() not called")
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	652 if not self.__started.is_set():
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	653 raise RuntimeError("cannot join thread before it is started")
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	654 if self is current_thread():
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	655 raise RuntimeError("cannot join current thread")
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	656
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	657 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	658 if not self.__stopped:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	659 self._note("%s.join(): waiting until thread stops", self)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	660 self.__block.acquire()
35932 b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	661 try:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	662 if timeout is None:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	663 while not self.__stopped:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	664 self.__block.wait()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	665 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	666 self._note("%s.join(): thread stopped", self)
35932 b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	667 else:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	668 deadline = _time() + timeout
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	669 while not self.__stopped:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	670 delay = deadline - _time()
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	671 if delay <= 0:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	672 if __debug__:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	673 self._note("%s.join(): timed out", self)
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	674 break
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	675 self.__block.wait(delay)
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	676 else:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	677 if __debug__:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	678 self._note("%s.join(): thread stopped", self)
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	679 finally:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	680 self.__block.release()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	681
48288 e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	682 @property
e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	683 def name(self):
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	684 assert self.__initialized, "Thread.__init__() not called"
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	685 return self.__name
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	686
48288 e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	687 @name.setter
e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	688 def name(self, name):
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	689 assert self.__initialized, "Thread.__init__() not called"
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	690 self.__name = str(name)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	691
48287 1d29e53ce2af change threading.getIdent to a property Benjamin Peterson <benjamin@python.org> parents: 48131 diff changeset	692 @property
1d29e53ce2af change threading.getIdent to a property Benjamin Peterson <benjamin@python.org> parents: 48131 diff changeset	693 def ident(self):
47438 7eaaad09b6cd Adds a Thread.getIdent() method to provide the _get_ident() value for Gregory P. Smith <greg@mad-scientist.com> parents: 46280 diff changeset	694 assert self.__initialized, "Thread.__init__() not called"
7eaaad09b6cd Adds a Thread.getIdent() method to provide the _get_ident() value for Gregory P. Smith <greg@mad-scientist.com> parents: 46280 diff changeset	695 return self.__ident
7eaaad09b6cd Adds a Thread.getIdent() method to provide the _get_ident() value for Gregory P. Smith <greg@mad-scientist.com> parents: 46280 diff changeset	696
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	697 def isAlive(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	698 assert self.__initialized, "Thread.__init__() not called"
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	699 return self.__started.is_set() and not self.__stopped
15873 3dd217fbdd59 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15586 diff changeset	700
48942 bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	701 is_alive = isAlive
48295 5c105f9a78e8 add py3k warnings for old threading APIs Benjamin Peterson <benjamin@python.org> parents: 48290 diff changeset	702
48288 e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	703 @property
e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	704 def daemon(self):
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	705 assert self.__initialized, "Thread.__init__() not called"
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	706 return self.__daemonic
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	707
48288 e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	708 @daemon.setter
e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	709 def daemon(self, daemonic):
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	710 if not self.__initialized:
2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	711 raise RuntimeError("Thread.__init__() not called")
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	712 if self.__started.is_set():
44481 2037f4cabb07 Backport r57216 (see issue #1731). Guido van Rossum <guido@python.org> parents: 40542 diff changeset	713 raise RuntimeError("cannot set daemon status of active thread");
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	714 self.__daemonic = daemonic
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	715
48290 9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	716 def isDaemon(self):
9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	717 return self.daemon
9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	718
9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	719 def setDaemon(self, daemonic):
9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	720 self.daemon = daemonic
9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	721
9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	722 def getName(self):
9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	723 return self.name
9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	724
9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	725 def setName(self, name):
9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	726 self.name = name
9d1856aba9f2 bring back the old API Benjamin Peterson <benjamin@python.org> parents: 48288 diff changeset	727
19727 f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	728 # The timer class was contributed by Itamar Shtull-Trauring
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	729
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	730 def Timer(args, *kwargs):
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	731 return _Timer(args, *kwargs)
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	732
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	733 class _Timer(Thread):
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	734 """Call a function after a specified number of seconds:
19953 0f9df563b65d Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19727 diff changeset	735
19727 f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	736 t = Timer(30.0, f, args=[], kwargs={})
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	737 t.start()
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	738 t.cancel() # stop the timer's action if it's still waiting
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	739 """
19953 0f9df563b65d Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19727 diff changeset	740
19727 f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	741 def __init__(self, interval, function, args=[], kwargs={}):
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	742 Thread.__init__(self)
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	743 self.interval = interval
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	744 self.function = function
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	745 self.args = args
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	746 self.kwargs = kwargs
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	747 self.finished = Event()
19953 0f9df563b65d Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19727 diff changeset	748
19727 f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	749 def cancel(self):
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	750 """Stop the timer if it hasn't finished yet"""
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	751 self.finished.set()
19953 0f9df563b65d Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19727 diff changeset	752
19727 f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	753 def run(self):
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	754 self.finished.wait(self.interval)
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	755 if not self.finished.is_set():
19727 f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	756 self.function(self.args, *self.kwargs)
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	757 self.finished.set()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	758
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	759 # Special thread class to represent the main thread
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	760 # This is garbage collected through an exit handler
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	761
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	762 class _MainThread(Thread):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	763
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	764 def __init__(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	765 Thread.__init__(self, name="MainThread")
45545 3e435a211356 Thread.start() used sleep(0.000001) to make sure it didn't return before the Jeffrey Yasskin <jyasskin@gmail.com> parents: 45478 diff changeset	766 self._Thread__started.set()
52596 21ba0b3fe819 Merged revisions 70897 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49059 diff changeset	767 self._set_ident()
52590 5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	768 with _active_limbo_lock:
5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	769 _active[_get_ident()] = self
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	770
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	771 def _set_daemon(self):
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	772 return False
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	773
40542 4203f8e6e86a Bug #1566280: Explicitly invoke threading._shutdown from Py_Main, Martin v. Löwis <martin@v.loewis.de> parents: 38794 diff changeset	774 def _exitfunc(self):
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	775 self._Thread__stop()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	776 t = _pickSomeNonDaemonThread()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	777 if t:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	778 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	779 self._note("%s: waiting for other threads", self)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	780 while t:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	781 t.join()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	782 t = _pickSomeNonDaemonThread()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	783 if __debug__:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	784 self._note("%s: exiting", self)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	785 self._Thread__delete()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	786
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	787 def _pickSomeNonDaemonThread():
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	788 for t in enumerate():
48288 e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	789 if not t.daemon and t.is_alive():
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	790 return t
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	791 return None
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	792
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	793
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	794 # Dummy thread class to represent threads not started here.
34363 35f31790c6f9 threading._DummyThread.__init__(): document obscure new code. Tim Peters <tim.peters@gmail.com> parents: 34361 diff changeset	795 # These aren't garbage collected when they die, nor can they be waited for.
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	796 # If they invoke anything in threading.py that calls current_thread(), they
34363 35f31790c6f9 threading._DummyThread.__init__(): document obscure new code. Tim Peters <tim.peters@gmail.com> parents: 34361 diff changeset	797 # leave an entry in the _active dict forever after.
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	798 # Their purpose is to return something from current_thread().
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	799 # They are marked as daemon threads so we won't wait for them
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	800 # when we exit (conform previous semantics).
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	801
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	802 class _DummyThread(Thread):
15873 3dd217fbdd59 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15586 diff changeset	803
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	804 def __init__(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	805 Thread.__init__(self, name=_newname("Dummy-%d"))
34363 35f31790c6f9 threading._DummyThread.__init__(): document obscure new code. Tim Peters <tim.peters@gmail.com> parents: 34361 diff changeset	806
35f31790c6f9 threading._DummyThread.__init__(): document obscure new code. Tim Peters <tim.peters@gmail.com> parents: 34361 diff changeset	807 # Thread.__block consumes an OS-level locking primitive, which
35f31790c6f9 threading._DummyThread.__init__(): document obscure new code. Tim Peters <tim.peters@gmail.com> parents: 34361 diff changeset	808 # can never be used by a _DummyThread. Since a _DummyThread
35f31790c6f9 threading._DummyThread.__init__(): document obscure new code. Tim Peters <tim.peters@gmail.com> parents: 34361 diff changeset	809 # instance is immortal, that's bad, so release this resource.
34361 8618168dca27 In _DummyThread objects the lock stored in __block (allocated thanks to Brett Cannon <bcannon@gmail.com> parents: 32778 diff changeset	810 del self._Thread__block
34363 35f31790c6f9 threading._DummyThread.__init__(): document obscure new code. Tim Peters <tim.peters@gmail.com> parents: 34361 diff changeset	811
45545 3e435a211356 Thread.start() used sleep(0.000001) to make sure it didn't return before the Jeffrey Yasskin <jyasskin@gmail.com> parents: 45478 diff changeset	812 self._Thread__started.set()
52596 21ba0b3fe819 Merged revisions 70897 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49059 diff changeset	813 self._set_ident()
52590 5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	814 with _active_limbo_lock:
5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	815 _active[_get_ident()] = self
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	816
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	817 def _set_daemon(self):
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	818 return True
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	819
21981 4e9cc26e03fd SF #515023. Make _DummyThread.join() signature match base class (Thread) Neal Norwitz <nnorwitz@gmail.com> parents: 21589 diff changeset	820 def join(self, timeout=None):
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	821 assert False, "cannot join a dummy thread"
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	822
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	823
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	824 # Global API functions
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	825
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	826 def currentThread():
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	827 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	828 return _active[_get_ident()]
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	829 except KeyError:
47598 c349f9fbc704 give the threading API PEP 8 names Benjamin Peterson <benjamin@python.org> parents: 47438 diff changeset	830 ##print "current_thread(): no current thread for", _get_ident()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	831 return _DummyThread()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	832
48942 bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	833 current_thread = currentThread
47601 8dc4312a2f75 add aliases to threading module Benjamin Peterson <benjamin@python.org> parents: 47598 diff changeset	834
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	835 def activeCount():
52590 5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	836 with _active_limbo_lock:
5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	837 return len(_active) + len(_limbo)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	838
48942 bc585b4d4606 remove py3k warnings about the threading api; update docs Benjamin Peterson <benjamin@python.org> parents: 48830 diff changeset	839 active_count = activeCount
47601 8dc4312a2f75 add aliases to threading module Benjamin Peterson <benjamin@python.org> parents: 47598 diff changeset	840
57119 2ebad3dfcde3 Merged revisions 76117 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56830 diff changeset	841 def _enumerate():
2ebad3dfcde3 Merged revisions 76117 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56830 diff changeset	842 # Same as enumerate(), but without the lock. Internal use only.
2ebad3dfcde3 Merged revisions 76117 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56830 diff changeset	843 return _active.values() + _limbo.values()
2ebad3dfcde3 Merged revisions 76117 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56830 diff changeset	844
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	845 def enumerate():
52590 5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	846 with _active_limbo_lock:
5744468e609b take the usual lock precautions around _active_limbo_lock Benjamin Peterson <benjamin@python.org> parents: 52579 diff changeset	847 return _active.values() + _limbo.values()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	848
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	849 from thread import stack_size
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	850
40542 4203f8e6e86a Bug #1566280: Explicitly invoke threading._shutdown from Py_Main, Martin v. Löwis <martin@v.loewis.de> parents: 38794 diff changeset	851 # Create the main thread object,
4203f8e6e86a Bug #1566280: Explicitly invoke threading._shutdown from Py_Main, Martin v. Löwis <martin@v.loewis.de> parents: 38794 diff changeset	852 # and make it available for the interpreter
4203f8e6e86a Bug #1566280: Explicitly invoke threading._shutdown from Py_Main, Martin v. Löwis <martin@v.loewis.de> parents: 38794 diff changeset	853 # (Py_Main) as threading._shutdown.
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	854
40542 4203f8e6e86a Bug #1566280: Explicitly invoke threading._shutdown from Py_Main, Martin v. Löwis <martin@v.loewis.de> parents: 38794 diff changeset	855 _shutdown = _MainThread()._exitfunc
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	856
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	857 # get thread-local implementation, either from the thread
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	858 # module, or from the python fallback
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	859
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	860 try:
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	861 from thread import _local as local
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	862 except ImportError:
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	863 from _threading_local import local
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	864
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	865
48274 43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	866 def _after_fork():
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	867 # This function is called by Python/ceval.c:PyEval_ReInitThreads which
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	868 # is called from PyOS_AfterFork. Here we cleanup threading module state
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	869 # that should not exist after a fork.
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	870
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	871 # Reset _active_limbo_lock, in case we forked while the lock was held
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	872 # by another (non-forked) thread. http://bugs.python.org/issue874900
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	873 global _active_limbo_lock
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	874 _active_limbo_lock = _allocate_lock()
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	875
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	876 # fork() only copied the current thread; clear references to others.
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	877 new_active = {}
47985 09beb96ba20d Apply patch for 874900: threading module can deadlock after fork Jesse Noller <jnoller@gmail.com> parents: 47606 diff changeset	878 current = current_thread()
09beb96ba20d Apply patch for 874900: threading module can deadlock after fork Jesse Noller <jnoller@gmail.com> parents: 47606 diff changeset	879 with _active_limbo_lock:
49063 77e1b95f1418 Backport of r66275/r66274 from trunk/py3k. This is the last bit of Gregory P. Smith <greg@mad-scientist.com> parents: 48274 diff changeset	880 for thread in _active.itervalues():
48274 43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	881 if thread is current:
49063 77e1b95f1418 Backport of r66275/r66274 from trunk/py3k. This is the last bit of Gregory P. Smith <greg@mad-scientist.com> parents: 48274 diff changeset	882 # There is only one active thread. We reset the ident to
77e1b95f1418 Backport of r66275/r66274 from trunk/py3k. This is the last bit of Gregory P. Smith <greg@mad-scientist.com> parents: 48274 diff changeset	883 # its new value since it can have changed.
77e1b95f1418 Backport of r66275/r66274 from trunk/py3k. This is the last bit of Gregory P. Smith <greg@mad-scientist.com> parents: 48274 diff changeset	884 ident = _get_ident()
77e1b95f1418 Backport of r66275/r66274 from trunk/py3k. This is the last bit of Gregory P. Smith <greg@mad-scientist.com> parents: 48274 diff changeset	885 thread._Thread__ident = ident
67341 3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	886 # Any condition variables hanging off of the active thread may
3e1c3d2a8689 Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66991 diff changeset	887 # be in an invalid state, so we reinitialize them.
67356 a6bc497b1962 backport fix from r87741 related to the issue6643 fix in r87727. Gregory P. Smith <greg@mad-scientist.com> parents: 67341 diff changeset	888 if hasattr(thread, '_reset_internal_locks'):
a6bc497b1962 backport fix from r87741 related to the issue6643 fix in r87727. Gregory P. Smith <greg@mad-scientist.com> parents: 67341 diff changeset	889 thread._reset_internal_locks()
48274 43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	890 new_active[ident] = thread
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	891 else:
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	892 # All the others are already stopped.
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	893 # We don't call _Thread__stop() because it tries to acquire
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	894 # thread._Thread__block which could also have been held while
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	895 # we forked.
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	896 thread._Thread__stopped = True
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	897
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	898 _limbo.clear()
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	899 _active.clear()
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	900 _active.update(new_active)
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	901 assert len(_active) == 1
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	902
43fa50b9eb12 Backport of r65032 from trunk Gregory P. Smith <greg@mad-scientist.com> parents: 44871 diff changeset	903
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	904 # Self-test code
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	905
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	906 def _test():
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	907
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	908 class BoundedQueue(_Verbose):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	909
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	910 def __init__(self, limit):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	911 _Verbose.__init__(self)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	912 self.mon = RLock()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	913 self.rc = Condition(self.mon)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	914 self.wc = Condition(self.mon)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	915 self.limit = limit
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: 30862 diff changeset	916 self.queue = deque()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	917
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	918 def put(self, item):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	919 self.mon.acquire()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	920 while len(self.queue) >= self.limit:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	921 self._note("put(%s): queue full", item)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	922 self.wc.wait()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	923 self.queue.append(item)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	924 self._note("put(%s): appended, length now %d",
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	925 item, len(self.queue))
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	926 self.rc.notify()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	927 self.mon.release()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	928
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	929 def get(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	930 self.mon.acquire()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	931 while not self.queue:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	932 self._note("get(): queue empty")
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	933 self.rc.wait()
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: 30862 diff changeset	934 item = self.queue.popleft()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	935 self._note("get(): got %s, %d left", item, len(self.queue))
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	936 self.wc.notify()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	937 self.mon.release()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	938 return item
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	939
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	940 class ProducerThread(Thread):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	941
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	942 def __init__(self, queue, quota):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	943 Thread.__init__(self, name="Producer")
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	944 self.queue = queue
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	945 self.quota = quota
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	946
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	947 def run(self):
8394 93aa08c77e60 Use random instead of whrandom. Guido van Rossum <guido@python.org> parents: 7949 diff changeset	948 from random import random
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	949 counter = 0
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	950 while counter < self.quota:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	951 counter = counter + 1
48288 e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	952 self.queue.put("%s.%d" % (self.name, counter))
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	953 _sleep(random() * 0.00001)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	954
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	955
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	956 class ConsumerThread(Thread):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	957
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	958 def __init__(self, queue, count):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	959 Thread.__init__(self, name="Consumer")
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	960 self.queue = queue
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	961 self.count = count
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	962
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	963 def run(self):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	964 while self.count > 0:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	965 item = self.queue.get()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	966 print item
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	967 self.count = self.count - 1
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	968
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	969 NP = 3
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	970 QL = 4
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	971 NI = 5
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	972
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	973 Q = BoundedQueue(QL)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	974 P = []
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	975 for i in range(NP):
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	976 t = ProducerThread(Q, NI)
48288 e143a8f35241 backport threading property changes Benjamin Peterson <benjamin@python.org> parents: 48287 diff changeset	977 t.name = ("Producer-%d" % (i+1))
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	978 P.append(t)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	979 C = ConsumerThread(Q, NI*NP)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	980 for t in P:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	981 t.start()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	982 _sleep(0.000001)
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	983 C.start()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	984 for t in P:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	985 t.join()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	986 C.join()
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	987
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	988 if __name__ == '__main__':
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	989 _test()

Mercurial > cpython-lru_cache-weakref

annotate Lib/threading.py @ 71583:cdff35544530 2.7