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

annotate Lib/threading.py @ 67467:abe201dfd3dc 3.1

Merged revisions 87861,87863 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87861 | antoine.pitrou | 2011-01-08 11:23:29 +0100 (sam., 08 janv. 2011) | 3 lines Fix test_ssl after r87849 ........ r87863 | antoine.pitrou | 2011-01-08 11:28:11 +0100 (sam., 08 janv. 2011) | 3 lines Add EHOSTUNREACH ('No route to host') to the errnos trapped by transient_internet(). ........

author	Antoine Pitrou <solipsis@pitrou.net>
date	Sat, 08 Jan 2011 10:31:09 +0000
parents	a3b7c290754a
children	3c9232a684ae

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
47266 7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	4 import _thread
26905 7ea7637341d0 - prefer "import ... as" to "import / (assignments) / del" for most things Fred Drake <fdrake@acm.org> parents: 26883 diff changeset	5
7ea7637341d0 - prefer "import ... as" to "import / (assignments) / del" for most things Fred Drake <fdrake@acm.org> parents: 26883 diff changeset	6 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	7 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	8 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	9
48941 4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	10 # Note regarding PEP 8 compliant names
4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	11 # This threading model was originally inspired by Java, and inherited
4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	12 # the convention of camelCase function and method names from that
4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	13 # language. Those originaly names are not in any imminent danger of
4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	14 # being deprecated (even for Py3k),so this module provides them as an
4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	15 # alias for the PEP 8 compliant names
4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	16 # Note that using the new PEP 8 compliant names facilitates substitution
4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	17 # with the multiprocessing module, which doesn't provide the old
4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	18 # Java inspired names.
4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	19
4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	20
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	21 # Rename some stuff so "from threading import *" is safe
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	22 __all__ = ['active_count', 'Condition', '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	23 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Thread',
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	24 '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	25
47266 7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	26 _start_new_thread = _thread.start_new_thread
7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	27 _allocate_lock = _thread.allocate_lock
7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	28 _get_ident = _thread.get_ident
7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	29 ThreadError = _thread.error
7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	30 del _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	31
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	32
29725 7d0af4561eed Make the classes exposed by threading.py new-style classes. This is Tim Peters <tim.peters@gmail.com> parents: 29724 diff changeset	33 # 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	34 # 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	35 # 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	36 # 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	37 # 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	38
29724 3b7b4fd5f7ca Resolved minor XXX question in the obvious way. Tim Peters <tim.peters@gmail.com> parents: 29686 diff changeset	39 _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	40
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	41 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	42
29725 7d0af4561eed Make the classes exposed by threading.py new-style classes. This is Tim Peters <tim.peters@gmail.com> parents: 29724 diff changeset	43 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	44
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	45 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	46 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	47 verbose = _VERBOSE
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	48 self._verbose = verbose
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	49
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	50 def _note(self, format, *args):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	51 if self._verbose:
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	52 format = format % args
66990 c70aa011c059 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60379 diff changeset	53 # Issue #4188: calling current_thread() can incur an infinite
c70aa011c059 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60379 diff changeset	54 # recursion if it has to create a DummyThread on the fly.
c70aa011c059 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60379 diff changeset	55 ident = _get_ident()
c70aa011c059 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60379 diff changeset	56 try:
c70aa011c059 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60379 diff changeset	57 name = _active[ident].name
c70aa011c059 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60379 diff changeset	58 except KeyError:
c70aa011c059 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60379 diff changeset	59 name = "<OS thread %d>" % ident
c70aa011c059 Merged revisions 87341 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60379 diff changeset	60 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	61 _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	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 else:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	64 # 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	65 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	66 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	67 pass
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	68 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	69 pass
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	70
29679 d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	71 # 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	72
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	73 _profile_hook = None
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	74 _trace_hook = None
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	75
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	76 def setprofile(func):
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	77 global _profile_hook
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	78 _profile_hook = func
29686 371092ce5c2b Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 29683 diff changeset	79
29679 d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	80 def settrace(func):
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	81 global _trace_hook
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	82 _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	83
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	84 # 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	85
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	86 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	87
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	88 def RLock(args, *kwargs):
28089 14f65d661084 Get rid of many apply() calls. Guido van Rossum <guido@python.org> parents: 26905 diff changeset	89 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	90
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	91 class _RLock(_Verbose):
15873 3dd217fbdd59 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15586 diff changeset	92
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	93 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	94 _Verbose.__init__(self, verbose)
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	95 self._block = _allocate_lock()
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	96 self._owner = None
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	97 self._count = 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	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 def __repr__(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	100 owner = self._owner
57160 fe33562d1f95 Merged revisions 76138,76173 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57121 diff changeset	101 try:
fe33562d1f95 Merged revisions 76138,76173 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57121 diff changeset	102 owner = _active[owner].name
fe33562d1f95 Merged revisions 76138,76173 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57121 diff changeset	103 except KeyError:
fe33562d1f95 Merged revisions 76138,76173 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57121 diff changeset	104 pass
fe33562d1f95 Merged revisions 76138,76173 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57121 diff changeset	105 return "<%s owner=%r count=%d>" % (
fe33562d1f95 Merged revisions 76138,76173 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57121 diff changeset	106 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	107
56002 fa91270b6087 Merged revisions 74821,74828-74831,74833,74835 via svnmerge from Georg Brandl <georg@python.org> parents: 52892 diff changeset	108 def acquire(self, blocking=True):
57160 fe33562d1f95 Merged revisions 76138,76173 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57121 diff changeset	109 me = _get_ident()
fe33562d1f95 Merged revisions 76138,76173 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57121 diff changeset	110 if self._owner == me:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	111 self._count = self._count + 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	112 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	113 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	114 return 1
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	115 rc = self._block.acquire(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	116 if rc:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	117 self._owner = me
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	118 self._count = 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	119 if __debug__:
34512 cb7896d77de5 Fixed typo in verbose output. Brett Cannon <bcannon@gmail.com> parents: 34363 diff changeset	120 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	121 else:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	122 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	123 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	124 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	125
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	126 __enter__ = acquire
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	127
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	128 def release(self):
57160 fe33562d1f95 Merged revisions 76138,76173 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57121 diff changeset	129 if self._owner != _get_ident():
56894 b085fd0611de Merged revisions 75797 via svnmerge from Georg Brandl <georg@python.org> parents: 56002 diff changeset	130 raise RuntimeError("cannot release un-acquired lock")
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	131 self._count = count = self._count - 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	132 if not count:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	133 self._owner = None
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	134 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	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.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	137 else:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	138 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	139 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	140
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	141 def __exit__(self, t, v, tb):
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	142 self.release()
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	143
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 # 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	145
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 40809 diff changeset	146 def _acquire_restore(self, state):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	147 self._block.acquire()
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	148 self._count, self._owner = 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	149 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	150 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	151
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	152 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	153 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	154 self._note("%s._release_save()", self)
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	155 count = self._count
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	156 self._count = 0
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	157 owner = self._owner
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	158 self._owner = None
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	159 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	160 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	161
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	162 def _is_owned(self):
57160 fe33562d1f95 Merged revisions 76138,76173 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57121 diff changeset	163 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	164
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	165
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	166 def Condition(args, *kwargs):
28089 14f65d661084 Get rid of many apply() calls. Guido van Rossum <guido@python.org> parents: 26905 diff changeset	167 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	168
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	169 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	170
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	171 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	172 _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	173 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	174 lock = RLock()
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	175 self._lock = 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	176 # 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	177 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	178 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	179 # 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	180 # 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	181 # 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	182 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	183 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	184 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	185 pass
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	186 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	187 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	188 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	189 pass
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	190 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	191 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	192 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	193 pass
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	194 self._waiters = []
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	195
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	196 def __enter__(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	197 return self._lock.__enter__()
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	198
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	199 def __exit__(self, *args):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	200 return self._lock.__exit__(*args)
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	201
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	202 def __repr__(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	203 return "<Condition(%s, %d)>" % (self._lock, len(self._waiters))
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	204
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	205 def _release_save(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	206 self._lock.release() # No state to save
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	207
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	208 def _acquire_restore(self, x):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	209 self._lock.acquire() # Ignore 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	210
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	211 def _is_owned(self):
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	212 # 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	213 # This method is called only if __lock doesn't have _is_owned().
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	214 if self._lock.acquire(0):
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	215 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	216 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	217 else:
22830 a9dd5e6d6805 Convert a pile of obvious "yes/no" functions to return bool. Tim Peters <tim.peters@gmail.com> parents: 21981 diff changeset	218 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	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 wait(self, timeout=None):
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	221 if not self._is_owned():
56894 b085fd0611de Merged revisions 75797 via svnmerge from Georg Brandl <georg@python.org> parents: 56002 diff changeset	222 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	223 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	224 waiter.acquire()
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	225 self._waiters.append(waiter)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	226 saved_state = self._release_save()
17303 836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	227 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	228 if timeout is None:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	229 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	230 if __debug__:
17303 836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	231 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	232 else:
19184 2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	233 # 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	234 # 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	235 # 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	236 # 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	237 # 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	238 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	239 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	240 while True:
17303 836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	241 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	242 if gotit:
17303 836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	243 break
19184 2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	244 remaining = endtime - _time()
2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	245 if remaining <= 0:
2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	246 break
2967ca96d07e _Condition.wait(): never sleep longer than the timeout time remaining, Tim Peters <tim.peters@gmail.com> parents: 17303 diff changeset	247 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	248 _sleep(delay)
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	249 if not gotit:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	250 if __debug__:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	251 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	252 try:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	253 self._waiters.remove(waiter)
17303 836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	254 except ValueError:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	255 pass
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	256 else:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	257 if __debug__:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	258 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	259 finally:
836cdf8d1245 SF bug [#410708] Condition.wait() and KeyboardInterrupt. Tim Peters <tim.peters@gmail.com> parents: 15873 diff changeset	260 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	261
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	262 def notify(self, n=1):
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	263 if not self._is_owned():
56894 b085fd0611de Merged revisions 75797 via svnmerge from Georg Brandl <georg@python.org> parents: 56002 diff changeset	264 raise RuntimeError("cannot notify on un-acquired lock")
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	265 __waiters = self._waiters
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	266 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	267 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	268 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	269 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	270 return
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	271 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	272 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	273 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	274 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	275 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	276 __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	277 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	278 pass
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	279
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	280 def notify_all(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	281 self.notify(len(self._waiters))
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	282
48941 4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	283 notifyAll = notify_all
4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	284
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	285
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	286 def Semaphore(args, *kwargs):
28089 14f65d661084 Get rid of many apply() calls. Guido van Rossum <guido@python.org> parents: 26905 diff changeset	287 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	288
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	289 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	290
11876 c27d3e8c45c4 Fix a typo in a comment Andrew M. Kuchling <amk@amk.ca> parents: 11707 diff changeset	291 # 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	292
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	293 def __init__(self, value=1, verbose=None):
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	294 if value < 0:
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	295 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	296 _Verbose.__init__(self, verbose)
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	297 self._cond = Condition(Lock())
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	298 self._value = 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	299
56002 fa91270b6087 Merged revisions 74821,74828-74831,74833,74835 via svnmerge from Georg Brandl <georg@python.org> parents: 52892 diff changeset	300 def acquire(self, blocking=True):
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	301 rc = False
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	302 self._cond.acquire()
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	303 while self._value == 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	304 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	305 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	306 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	307 self._note("%s.acquire(%s): blocked waiting, value=%s",
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	308 self, blocking, self._value)
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	309 self._cond.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	310 else:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	311 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	312 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	313 self._note("%s.acquire: success, value=%s",
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	314 self, self._value)
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	315 rc = True
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	316 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	317 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	318
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	319 __enter__ = acquire
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	320
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	321 def release(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	322 self._cond.acquire()
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	323 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	324 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	325 self._note("%s.release: success, value=%s",
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	326 self, self._value)
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	327 self._cond.notify()
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	328 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	329
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	330 def __exit__(self, t, v, tb):
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	331 self.release()
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 35932 diff changeset	332
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	333
19404 6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	334 def BoundedSemaphore(args, *kwargs):
28089 14f65d661084 Get rid of many apply() calls. Guido van Rossum <guido@python.org> parents: 26905 diff changeset	335 return _BoundedSemaphore(args, *kwargs)
19404 6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	336
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	337 class _BoundedSemaphore(_Semaphore):
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	338 """Semaphore that checks that # releases is <= # acquires"""
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	339 def __init__(self, value=1, verbose=None):
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	340 _Semaphore.__init__(self, value, verbose)
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	341 self._initial_value = value
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	342
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	343 def release(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	344 if self._value >= self._initial_value:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42679 diff changeset	345 raise ValueError("Semaphore released too many times")
19404 6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	346 return _Semaphore.release(self)
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	347
6125d9f92441 Added new BoundedSemaphore class. Closes bug 452836. Skip Montanaro <skip@pobox.com> parents: 19379 diff changeset	348
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	349 def Event(args, *kwargs):
28089 14f65d661084 Get rid of many apply() calls. Guido van Rossum <guido@python.org> parents: 26905 diff changeset	350 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	351
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	352 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	353
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	354 # 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	355
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	356 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	357 _Verbose.__init__(self, verbose)
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	358 self._cond = Condition(Lock())
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	359 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	360
67355 a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	361 def _reset_internal_locks(self):
a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	362 # private! called by Thread._reset_internal_locks by _after_fork()
a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	363 self._cond.__init__()
a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	364
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	365 def is_set(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	366 return self._flag
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	367
48941 4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	368 isSet = is_set
48757 54138ee20e57 add full deprecation warnings for old threading APIs Benjamin Peterson <benjamin@python.org> parents: 48748 diff changeset	369
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	370 def set(self):
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	371 self._cond.acquire()
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	372 try:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	373 self._flag = True
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	374 self._cond.notify_all()
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	375 finally:
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	376 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	377
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	378 def clear(self):
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	379 self._cond.acquire()
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	380 try:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	381 self._flag = False
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	382 finally:
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	383 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	384
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 wait(self, timeout=None):
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	386 self._cond.acquire()
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	387 try:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	388 if not self._flag:
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	389 self._cond.wait(timeout)
52892 792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	390 return self._flag
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	391 finally:
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	392 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	393
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	394 # 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	395 _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	396 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	397 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	398 _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	399 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	400
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	401 # 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	402 _active_limbo_lock = _allocate_lock()
34363 35f31790c6f9 threading._DummyThread.__init__(): document obscure new code. Tim Peters <tim.peters@gmail.com> parents: 34361 diff changeset	403 _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	404 _limbo = {}
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	405
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	406
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	407 # 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	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 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	410
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	411 __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	412 # 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	413 # 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	414 # 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	415 # 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	416 __exc_info = _sys.exc_info
46161 848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45549 diff changeset	417 # Keep sys.exc_clear too to clear the exception just before
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45549 diff changeset	418 # allowing .join() to return.
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45549 diff changeset	419 #XXX __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	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 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	422 args=(), kwargs=None, verbose=None):
8474 049aa3a8a172 Get rid of tabnanny's last complaints. Guido van Rossum <guido@python.org> parents: 8454 diff changeset	423 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	424 _Verbose.__init__(self, verbose)
35236 d0c6965b525e bug [ 1238170 ] threading.Thread uses {} as default argument Georg Brandl <georg@python.org> parents: 34512 diff changeset	425 if kwargs is None:
d0c6965b525e bug [ 1238170 ] threading.Thread uses {} as default argument Georg Brandl <georg@python.org> parents: 34512 diff changeset	426 kwargs = {}
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	427 self._target = target
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	428 self._name = str(name or _newname())
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	429 self._args = args
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	430 self._kwargs = kwargs
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	431 self._daemonic = self._set_daemon()
47555 7d824fd131ad Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from Georg Brandl <georg@python.org> parents: 47266 diff changeset	432 self._ident = None
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	433 self._started = Event()
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	434 self._stopped = False
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	435 self._block = Condition(Lock())
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	436 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	437 # 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	438 # sys.exc_info since it can be changed between instances
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	439 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	440
67355 a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	441 def _reset_internal_locks(self):
a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	442 # private! Called by _after_fork() to reset our internal locks as
a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	443 # they may be in an invalid state leading to a deadlock or crash.
a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	444 if hasattr(self, '_block'): # DummyThread deletes _block
a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	445 self._block.__init__()
a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	446 self._started._reset_internal_locks()
a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	447
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	448 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	449 # Overridden in _MainThread and _DummyThread
48745 2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	450 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	451
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	452 def __repr__(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	453 assert self._initialized, "Thread.__init__() was not called"
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	454 status = "initial"
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	455 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	456 status = "started"
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	457 if self._stopped:
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	458 status = "stopped"
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	459 if self._daemonic:
47555 7d824fd131ad Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from Georg Brandl <georg@python.org> parents: 47266 diff changeset	460 status += " daemon"
7d824fd131ad Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from Georg Brandl <georg@python.org> parents: 47266 diff changeset	461 if self._ident is not None:
7d824fd131ad Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from Georg Brandl <georg@python.org> parents: 47266 diff changeset	462 status += " %s" % self._ident
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	463 return "<%s(%s, %s)>" % (self.__class__.__name__, self._name, status)
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	464
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	465 def start(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	466 if not self._initialized:
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	467 raise RuntimeError("thread.__init__() not called")
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	468
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	469 if self._started.is_set():
60379 c10024abd118 Merged revisions 79819 via svnmerge from Senthil Kumaran <orsenthil@gmail.com> parents: 59203 diff changeset	470 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	471 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	472 self._note("%s.start(): starting thread", self)
52892 792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	473 with _active_limbo_lock:
792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	474 _limbo[self] = self
59203 9e8113e76adb Merged revisions 78519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57160 diff changeset	475 try:
9e8113e76adb Merged revisions 78519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57160 diff changeset	476 _start_new_thread(self._bootstrap, ())
9e8113e76adb Merged revisions 78519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57160 diff changeset	477 except Exception:
9e8113e76adb Merged revisions 78519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57160 diff changeset	478 with _active_limbo_lock:
9e8113e76adb Merged revisions 78519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57160 diff changeset	479 del _limbo[self]
9e8113e76adb Merged revisions 78519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 57160 diff changeset	480 raise
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	481 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	482
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	483 def run(self):
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	484 try:
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	485 if self._target:
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	486 self._target(self._args, *self._kwargs)
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	487 finally:
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	488 # Avoid a refcycle if the thread is running a function with
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	489 # an argument that has a member that points to the thread.
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	490 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	491
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	492 def _bootstrap(self):
42678 af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	493 # Wrapper around the real bootstrap code that ignores
af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	494 # exceptions during interpreter cleanup. Those typically
af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	495 # happen when a daemon thread wakes up at an unfortunate
af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	496 # moment, finds the world around it destroyed, and raises some
af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	497 # random exception *** while trying to report the exception in
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	498 # _bootstrap_inner() below ***. Those random exceptions
42678 af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	499 # don't help anybody, and they confuse users, so we suppress
af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	500 # them. We suppress them only when it appears that the world
af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	501 # indeed has already been destroyed, so that exceptions in
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	502 # _bootstrap_inner() during normal business hours are properly
42678 af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	503 # reported. Also, we only suppress them for daemonic threads;
af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	504 # if a non-daemonic encounters this, something else is wrong.
af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	505 try:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	506 self._bootstrap_inner()
42678 af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	507 except:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	508 if self._daemonic and _sys is None:
42678 af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	509 return
af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	510 raise
af6a7190cabc Merged revisions 57152-57220 via svnmerge from Guido van Rossum <guido@python.org> parents: 42466 diff changeset	511
52892 792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	512 def _set_ident(self):
792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	513 self._ident = _get_ident()
792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	514
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	515 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	516 try:
52892 792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	517 self._set_ident()
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	518 self._started.set()
52892 792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	519 with _active_limbo_lock:
792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	520 _active[self._ident] = self
792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	521 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	522 if __debug__:
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	523 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	524
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	525 if _trace_hook:
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	526 self._note("%s._bootstrap(): registering trace hook", self)
29679 d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	527 _sys.settrace(_trace_hook)
d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	528 if _profile_hook:
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	529 self._note("%s._bootstrap(): registering profile hook", self)
29679 d0f15977f37f Add settrace() and setprofile() functions to the threading library. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29676 diff changeset	530 _sys.setprofile(_profile_hook)
29686 371092ce5c2b Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 29683 diff changeset	531
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	532 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	533 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	534 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	535 if __debug__:
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	536 self._note("%s._bootstrap(): raised SystemExit", 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	537 except:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	538 if __debug__:
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	539 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	540 # If sys.stderr is no more (most likely from interpreter
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	541 # shutdown) use self._stderr. Otherwise still use sys (as in
32475 796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	542 # _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	543 # self.
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	544 if _sys:
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	545 _sys.stderr.write("Exception in thread %s:\n%s\n" %
48745 2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	546 (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	547 else:
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	548 # 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	549 # 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	550 # Lib/traceback.py)
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	551 exc_type, exc_value, exc_tb = self._exc_info()
32475 796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	552 try:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40582 diff changeset	553 print((
48745 2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	554 "Exception in thread " + self.name +
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	555 " (most likely raised during interpreter shutdown):"), file=self._stderr)
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40582 diff changeset	556 print((
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	557 "Traceback (most recent call last):"), file=self._stderr)
32475 796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	558 while exc_tb:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40582 diff changeset	559 print((
32475 796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	560 ' 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	561 (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	562 exc_tb.tb_lineno,
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	563 exc_tb.tb_frame.f_code.co_name)), file=self._stderr)
32475 796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	564 exc_tb = exc_tb.tb_next
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	565 print(("%s: %s" % (exc_type, exc_value)), file=self._stderr)
32475 796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	566 # 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	567 # 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	568 finally:
796ccb9082ef threading.Thread objects will now print a traceback for an exception raised Brett Cannon <bcannon@gmail.com> parents: 31629 diff changeset	569 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	570 else:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	571 if __debug__:
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	572 self._note("%s._bootstrap(): normal return", self)
46161 848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45549 diff changeset	573 finally:
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45549 diff changeset	574 # Prevent a race in
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45549 diff changeset	575 # test_threading.test_no_refcycle_through_target when
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45549 diff changeset	576 # the exception keeps the target alive past when we
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45549 diff changeset	577 # assert that it's dead.
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45549 diff changeset	578 #XXX self.__exc_clear()
848160d10780 Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45549 diff changeset	579 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	580 finally:
44885 fefaa0e66fdd Merged revisions 60176-60209 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43020 diff changeset	581 with _active_limbo_lock:
fefaa0e66fdd Merged revisions 60176-60209 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43020 diff changeset	582 self._stop()
fefaa0e66fdd Merged revisions 60176-60209 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43020 diff changeset	583 try:
47555 7d824fd131ad Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from Georg Brandl <georg@python.org> parents: 47266 diff changeset	584 # We don't call self._delete() because it also
44885 fefaa0e66fdd Merged revisions 60176-60209 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43020 diff changeset	585 # grabs _active_limbo_lock.
fefaa0e66fdd Merged revisions 60176-60209 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43020 diff changeset	586 del _active[_get_ident()]
fefaa0e66fdd Merged revisions 60176-60209 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43020 diff changeset	587 except:
fefaa0e66fdd Merged revisions 60176-60209 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43020 diff changeset	588 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	589
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	590 def _stop(self):
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	591 self._block.acquire()
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	592 self._stopped = True
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	593 self._block.notify_all()
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	594 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	595
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	596 def _delete(self):
32778 7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	597 "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	598
47266 7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	599 # Notes about running with _dummy_thread:
32778 7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	600 #
47266 7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	601 # Must take care to not raise an exception if _dummy_thread is being
32778 7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	602 # used (and thus this module is being used as an instance of
47266 7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	603 # dummy_threading). _dummy_thread.get_ident() always returns -1 since
7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	604 # there is only one thread if _dummy_thread is being used. Thus
32778 7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	605 # 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	606 # 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	607 #
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	608 # 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	609 # gets overwritten the instant an instance of Thread is created; both
47266 7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	610 # threads return -1 from _dummy_thread.get_ident() and thus have the
32778 7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	611 # 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	612 # '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	613 # 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	614 #
7af695bc5480 Thread.__delete: Discussion of internal obscurities belongs in comments Tim Peters <tim.peters@gmail.com> parents: 32774 diff changeset	615 # 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	616 # _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	617 # 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	618 # 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	619
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	620 try:
46304 3442e9e6b2cf Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62127-62128,62130,62132,62134-62137,62139-62142,62144,62146-62148,62150-62152,62155-62161 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46161 diff changeset	621 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	622 del _active[_get_ident()]
46304 3442e9e6b2cf Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62127-62128,62130,62132,62134-62137,62139-62142,62144,62146-62148,62150-62152,62155-62161 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46161 diff changeset	623 # There must not be any python code between the previous line
3442e9e6b2cf Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62127-62128,62130,62132,62134-62137,62139-62142,62144,62146-62148,62150-62152,62155-62161 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46161 diff changeset	624 # and after the lock is released. Otherwise a tracing function
3442e9e6b2cf Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62127-62128,62130,62132,62134-62137,62139-62142,62144,62146-62148,62150-62152,62155-62161 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46161 diff changeset	625 # could try to acquire the lock again in the same thread, (in
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	626 # current_thread()), and would block.
46304 3442e9e6b2cf Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62127-62128,62130,62132,62134-62137,62139-62142,62144,62146-62148,62150-62152,62155-62161 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46161 diff changeset	627 except KeyError:
3442e9e6b2cf Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62127-62128,62130,62132,62134-62137,62139-62142,62144,62146-62148,62150-62152,62155-62161 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46161 diff changeset	628 if 'dummy_threading' not in _sys.modules:
3442e9e6b2cf Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62127-62128,62130,62132,62134-62137,62139-62142,62144,62146-62148,62150-62152,62155-62161 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46161 diff changeset	629 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	630
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	631 def join(self, timeout=None):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	632 if not self._initialized:
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	633 raise RuntimeError("Thread.__init__() not called")
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	634 if not self._started.is_set():
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	635 raise RuntimeError("cannot join thread before it is started")
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	636 if self is current_thread():
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	637 raise RuntimeError("cannot join current thread")
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	638
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	639 if __debug__:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	640 if not self._stopped:
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	641 self._note("%s.join(): waiting until thread stops", self)
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	642
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	643 self._block.acquire()
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	644 try:
35932 b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	645 if timeout is None:
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	646 while not self._stopped:
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	647 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	648 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	649 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	650 else:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	651 deadline = _time() + timeout
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	652 while not self._stopped:
35932 b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	653 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	654 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	655 if __debug__:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	656 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	657 break
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	658 self._block.wait(delay)
35932 b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	659 else:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	660 if __debug__:
b7c6c461a808 Prevent threading.Thread.join() from blocking when a previous call raised an Brett Cannon <bcannon@gmail.com> parents: 35236 diff changeset	661 self._note("%s.join(): thread stopped", self)
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	662 finally:
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44885 diff changeset	663 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	664
48745 2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	665 @property
2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	666 def name(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	667 assert self._initialized, "Thread.__init__() not called"
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	668 return 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	669
48745 2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	670 @name.setter
2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	671 def name(self, name):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	672 assert self._initialized, "Thread.__init__() not called"
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	673 self._name = str(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	674
48743 76620010d782 Merged revisions 65818 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48516 diff changeset	675 @property
76620010d782 Merged revisions 65818 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48516 diff changeset	676 def ident(self):
47555 7d824fd131ad Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from Georg Brandl <georg@python.org> parents: 47266 diff changeset	677 assert self._initialized, "Thread.__init__() not called"
7d824fd131ad Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from Georg Brandl <georg@python.org> parents: 47266 diff changeset	678 return self._ident
7d824fd131ad Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from Georg Brandl <georg@python.org> parents: 47266 diff changeset	679
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	680 def is_alive(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	681 assert self._initialized, "Thread.__init__() not called"
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	682 return self._started.is_set() and not self._stopped
15873 3dd217fbdd59 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15586 diff changeset	683
48941 4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	684 isAlive = is_alive
48757 54138ee20e57 add full deprecation warnings for old threading APIs Benjamin Peterson <benjamin@python.org> parents: 48748 diff changeset	685
48745 2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	686 @property
2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	687 def daemon(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	688 assert self._initialized, "Thread.__init__() not called"
e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	689 return self._daemonic
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	690
48745 2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	691 @daemon.setter
2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	692 def daemon(self, daemonic):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	693 if not self._initialized:
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	694 raise RuntimeError("Thread.__init__() not called")
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	695 if self._started.is_set():
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	696 raise RuntimeError("cannot set daemon status of active thread");
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	697 self._daemonic = daemonic
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	698
48748 d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	699 def isDaemon(self):
d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	700 return self.daemon
d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	701
d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	702 def setDaemon(self, daemonic):
d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	703 self.daemon = daemonic
d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	704
d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	705 def getName(self):
d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	706 return self.name
d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	707
d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	708 def setName(self, name):
d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	709 self.name = name
d6537a3e1b73 Merged revisions 65826 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48745 diff changeset	710
19727 f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	711 # 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	712
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	713 def Timer(args, *kwargs):
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	714 return _Timer(args, *kwargs)
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	715
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	716 class _Timer(Thread):
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	717 """Call a function after a specified number of seconds:
19953 0f9df563b65d Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19727 diff changeset	718
19727 f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	719 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	720 t.start()
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	721 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	722 """
19953 0f9df563b65d Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19727 diff changeset	723
19727 f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	724 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	725 Thread.__init__(self)
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	726 self.interval = interval
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	727 self.function = function
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	728 self.args = args
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	729 self.kwargs = kwargs
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	730 self.finished = Event()
19953 0f9df563b65d Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19727 diff changeset	731
19727 f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	732 def cancel(self):
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	733 """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	734 self.finished.set()
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 def run(self):
f3036d4e3c22 Patch #428326: New class threading.Timer. Martin v. Löwis <martin@v.loewis.de> parents: 19404 diff changeset	737 self.finished.wait(self.interval)
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	738 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	739 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	740 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	741
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	742 # 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	743 # 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	744
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	745 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	746
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	747 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	748 Thread.__init__(self, name="MainThread")
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	749 self._started.set()
52892 792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	750 self._set_ident()
792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	751 with _active_limbo_lock:
792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	752 _active[self._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	753
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	754 def _set_daemon(self):
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	755 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	756
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	757 def _exitfunc(self):
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	758 self._stop()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	759 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	760 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	761 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	762 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	763 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	764 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	765 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	766 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	767 self._note("%s: exiting", self)
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	768 self._delete()
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	769
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	770 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	771 for t in enumerate():
48745 2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	772 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	773 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	774 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	775
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	776
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	777 # 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	778 # These aren't garbage collected when they die, nor can they be waited for.
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	779 # 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	780 # leave an entry in the _active dict forever after.
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	781 # 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	782 # 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	783 # 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	784
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	785 class _DummyThread(Thread):
15873 3dd217fbdd59 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15586 diff changeset	786
7949 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 __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	788 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	789
67355 a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	790 # Thread._block consumes an OS-level locking primitive, which
34363 35f31790c6f9 threading._DummyThread.__init__(): document obscure new code. Tim Peters <tim.peters@gmail.com> parents: 34361 diff changeset	791 # 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	792 # instance is immortal, that's bad, so release this resource.
42679 e71c3223810f Get rid of all __private variables and methods in the threading module. Guido van Rossum <guido@python.org> parents: 42678 diff changeset	793 del self._block
34363 35f31790c6f9 threading._DummyThread.__init__(): document obscure new code. Tim Peters <tim.peters@gmail.com> parents: 34361 diff changeset	794
45549 8dd30fe11a4b Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45495 diff changeset	795 self._started.set()
52892 792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	796 self._set_ident()
792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	797 with _active_limbo_lock:
792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	798 _active[self._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	799
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	800 def _set_daemon(self):
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	801 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	802
21981 4e9cc26e03fd SF #515023. Make _DummyThread.join() signature match base class (Thread) Neal Norwitz <nnorwitz@gmail.com> parents: 21589 diff changeset	803 def join(self, timeout=None):
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 22830 diff changeset	804 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	805
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	806
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	807 # 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	808
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	809 def 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	810 try:
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	811 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	812 except KeyError:
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	813 ##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	814 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	815
48941 4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	816 currentThread = current_thread
48757 54138ee20e57 add full deprecation warnings for old threading APIs Benjamin Peterson <benjamin@python.org> parents: 48748 diff changeset	817
47615 045f83a1b864 Merged revisions 64125 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47555 diff changeset	818 def active_count():
52892 792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	819 with _active_limbo_lock:
792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	820 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	821
48941 4fc480be1e4d remove the deprecation warnings for the old threading API; update the docs Benjamin Peterson <benjamin@python.org> parents: 48757 diff changeset	822 activeCount = active_count
48757 54138ee20e57 add full deprecation warnings for old threading APIs Benjamin Peterson <benjamin@python.org> parents: 48748 diff changeset	823
57121 4ea0a80ed76a Merged revisions 76119 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	824 def _enumerate():
4ea0a80ed76a Merged revisions 76119 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	825 # Same as enumerate(), but without the lock. Internal use only.
4ea0a80ed76a Merged revisions 76119 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	826 return list(_active.values()) + list(_limbo.values())
4ea0a80ed76a Merged revisions 76119 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	827
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	828 def enumerate():
52892 792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	829 with _active_limbo_lock:
792bb885029f Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49058 diff changeset	830 return list(_active.values()) + list(_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	831
47266 7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	832 from _thread import stack_size
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	833
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	834 # Create the main thread object,
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	835 # and make it available for the interpreter
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	836 # (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	837
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	838 _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	839
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	840 # 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	841 # 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	842
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	843 try:
47266 7fe3a8648ce2 Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. Georg Brandl <georg@python.org> parents: 46304 diff changeset	844 from _thread import _local as local
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	845 except ImportError:
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	846 from _threading_local import local
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 32475 diff changeset	847
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
48516 eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	849 def _after_fork():
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	850 # This function is called by Python/ceval.c:PyEval_ReInitThreads which
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	851 # is called from PyOS_AfterFork. Here we cleanup threading module state
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	852 # that should not exist after a fork.
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	853
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	854 # Reset _active_limbo_lock, in case we forked while the lock was held
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	855 # by another (non-forked) thread. http://bugs.python.org/issue874900
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	856 global _active_limbo_lock
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	857 _active_limbo_lock = _allocate_lock()
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	858
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	859 # fork() only copied the current thread; clear references to others.
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	860 new_active = {}
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	861 current = current_thread()
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	862 with _active_limbo_lock:
49058 179f8d89ad19 Issue #874900: fix behaviour of threading module after a fork. Antoine Pitrou <solipsis@pitrou.net> parents: 48941 diff changeset	863 for thread in _active.values():
48516 eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	864 if thread is current:
49058 179f8d89ad19 Issue #874900: fix behaviour of threading module after a fork. Antoine Pitrou <solipsis@pitrou.net> parents: 48941 diff changeset	865 # There is only one active thread. We reset the ident to
179f8d89ad19 Issue #874900: fix behaviour of threading module after a fork. Antoine Pitrou <solipsis@pitrou.net> parents: 48941 diff changeset	866 # its new value since it can have changed.
179f8d89ad19 Issue #874900: fix behaviour of threading module after a fork. Antoine Pitrou <solipsis@pitrou.net> parents: 48941 diff changeset	867 ident = _get_ident()
179f8d89ad19 Issue #874900: fix behaviour of threading module after a fork. Antoine Pitrou <solipsis@pitrou.net> parents: 48941 diff changeset	868 thread._ident = ident
67340 ad2f34380aac Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66990 diff changeset	869 # Any condition variables hanging off of the active thread may
ad2f34380aac Merged revisions 87710 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 66990 diff changeset	870 # be in an invalid state, so we reinitialize them.
67355 a3b7c290754a Merged revisions 87740 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 67340 diff changeset	871 thread._reset_internal_locks()
48516 eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	872 new_active[ident] = thread
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	873 else:
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	874 # All the others are already stopped.
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	875 # We don't call _Thread__stop() because it tries to acquire
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	876 # thread._Thread__block which could also have been held while
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	877 # we forked.
49058 179f8d89ad19 Issue #874900: fix behaviour of threading module after a fork. Antoine Pitrou <solipsis@pitrou.net> parents: 48941 diff changeset	878 thread._stopped = True
48516 eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	879
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	880 _limbo.clear()
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	881 _active.clear()
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	882 _active.update(new_active)
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	883 assert len(_active) == 1
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	884
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 47669 diff changeset	885
7949 58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	886 # 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	887
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	888 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	889
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	890 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	891
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	892 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	893 _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	894 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	895 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	896 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	897 self.limit = limit
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: 30862 diff changeset	898 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	899
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	900 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	901 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	902 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	903 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	904 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	905 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	906 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	907 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	908 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	909 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	910
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	911 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	912 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	913 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	914 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	915 self.rc.wait()
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: 30862 diff changeset	916 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	917 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	918 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	919 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	920 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	921
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	922 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	923
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	924 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	925 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	926 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	927 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	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 run(self):
8394 93aa08c77e60 Use random instead of whrandom. Guido van Rossum <guido@python.org> parents: 7949 diff changeset	930 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	931 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	932 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	933 counter = counter + 1
48745 2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	934 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	935 _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	936
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	937
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	938 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	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 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	941 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	942 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	943 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	944
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	945 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	946 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	947 item = self.queue.get()
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40582 diff changeset	948 print(item)
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 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	950
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	951 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	952 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	953 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	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 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	956 P = []
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	957 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	958 t = ProducerThread(Q, NI)
48745 2614d501de9a change is_daemon, set_daemon, get_name, and set_name to properties Benjamin Peterson <benjamin@python.org> parents: 48743 diff changeset	959 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	960 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	961 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	962 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	963 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	964 _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	965 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	966 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	967 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	968 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	969
58d6815af002 New Java-style threading module. The doc strings are in a separate module. Guido van Rossum <guido@python.org> parents: diff changeset	970 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	971 _test()

Mercurial > cpython-lru_cache-weakref

annotate Lib/threading.py @ 67467:abe201dfd3dc 3.1