Staging
v0.8.1
https://github.com/python/cpython
Revision 448db2155fc81d2aa84f37dc58683251cba8772e authored by Thomas Wouters on 16 September 2009, 20:06:36 UTC, committed by Thomas Wouters on 16 September 2009, 20:06:36 UTC
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74841 | thomas.wouters | 2009-09-16 12:55:54 -0700 (Wed, 16 Sep 2009) | 23 lines


  Fix issue #1590864, multiple threads and fork() can cause deadlocks, by
  acquiring the import lock around fork() calls. This prevents other threads
  from having that lock while the fork happens, and is the recommended way of
  dealing with such issues. There are two other locks we care about, the GIL
  and the Thread Local Storage lock. The GIL is obviously held when calling
  Python functions like os.fork(), and the TLS lock is explicitly reallocated
  instead, while also deleting now-orphaned TLS data.

  This only fixes calls to os.fork(), not extension modules or embedding
  programs calling C's fork() directly. Solving that requires a new set of API
  functions, and possibly a rewrite of the Python/thread_*.c mess. Add a
  warning explaining the problem to the documentation in the mean time.

  This also changes behaviour a little on AIX. Before, AIX (but only AIX) was
  getting the import lock reallocated, seemingly to avoid this very same
  problem. This is not the right approach, because the import lock is a
  re-entrant one, and reallocating would do the wrong thing when forking while
  holding the import lock.

  Will backport to 2.6, minus the tiny AIX behaviour change.
........
1 parent c5a6fd7
History
Tip revision: 448db2155fc81d2aa84f37dc58683251cba8772e authored by Thomas Wouters on 16 September 2009, 20:06:36 UTC
Merged revisions 74841 via svnmerge from
Tip revision: 448db21
File Mode Size
Python-ast.h -rw-r--r-- 19.6 KB
Python.h -rw-r--r-- 4.3 KB
abstract.h -rw-r--r-- 42.0 KB
asdl.h -rw-r--r-- 1.1 KB
ast.h -rw-r--r-- 230 bytes
bitset.h -rw-r--r-- 792 bytes
boolobject.h -rw-r--r-- 912 bytes
bufferobject.h -rw-r--r-- 922 bytes
bytearrayobject.h -rw-r--r-- 1.8 KB
bytes_methods.h -rw-r--r-- 3.2 KB
bytesobject.h -rw-r--r-- 1.4 KB
cStringIO.h -rw-r--r-- 2.0 KB
cellobject.h -rw-r--r-- 651 bytes
ceval.h -rw-r--r-- 4.8 KB
classobject.h -rw-r--r-- 2.9 KB
cobject.h -rw-r--r-- 1.8 KB
code.h -rw-r--r-- 3.4 KB
codecs.h -rw-r--r-- 4.9 KB
compile.h -rw-r--r-- 1.1 KB
complexobject.h -rw-r--r-- 1.5 KB
datetime.h -rw-r--r-- 8.1 KB
descrobject.h -rw-r--r-- 2.2 KB
dictobject.h -rw-r--r-- 5.6 KB
enumobject.h -rw-r--r-- 253 bytes
errcode.h -rw-r--r-- 1.3 KB
eval.h -rw-r--r-- 557 bytes
fileobject.h -rw-r--r-- 2.6 KB
floatobject.h -rw-r--r-- 4.9 KB
frameobject.h -rw-r--r-- 2.9 KB
funcobject.h -rw-r--r-- 2.9 KB
genobject.h -rw-r--r-- 891 bytes
graminit.h -rw-r--r-- 1.9 KB
grammar.h -rw-r--r-- 2.0 KB
import.h -rw-r--r-- 2.2 KB
intobject.h -rw-r--r-- 2.7 KB
intrcheck.h -rw-r--r-- 274 bytes
iterobject.h -rw-r--r-- 522 bytes
listobject.h -rw-r--r-- 2.5 KB
longintrepr.h -rw-r--r-- 2.3 KB
longobject.h -rw-r--r-- 5.5 KB
marshal.h -rw-r--r-- 713 bytes
metagrammar.h -rw-r--r-- 253 bytes
methodobject.h -rw-r--r-- 3.2 KB
modsupport.h -rw-r--r-- 4.9 KB
moduleobject.h -rw-r--r-- 609 bytes
node.h -rw-r--r-- 890 bytes
object.h -rw-r--r-- 35.1 KB
objimpl.h -rw-r--r-- 12.1 KB
opcode.h -rw-r--r-- 4.2 KB
osdefs.h -rw-r--r-- 942 bytes
parsetok.h -rw-r--r-- 1.7 KB
patchlevel.h -rw-r--r-- 1.4 KB
pgen.h -rw-r--r-- 253 bytes
pgenheaders.h -rw-r--r-- 1.1 KB
py_curses.h -rw-r--r-- 4.3 KB
pyarena.h -rw-r--r-- 2.6 KB
pydebug.h -rw-r--r-- 1.2 KB
pyerrors.h -rw-r--r-- 11.1 KB
pyexpat.h -rw-r--r-- 1.9 KB
pyfpe.h -rw-r--r-- 8.3 KB
pygetopt.h -rw-r--r-- 306 bytes
pymacconfig.h -rw-r--r-- 2.2 KB
pymactoolbox.h -rw-r--r-- 7.8 KB
pymath.h -rw-r--r-- 6.5 KB
pymem.h -rw-r--r-- 4.5 KB
pyport.h -rw-r--r-- 22.2 KB
pystate.h -rw-r--r-- 6.1 KB
pystrcmp.h -rw-r--r-- 463 bytes
pystrtod.h -rw-r--r-- 359 bytes
pythonrun.h -rw-r--r-- 6.5 KB
pythread.h -rw-r--r-- 1.4 KB
rangeobject.h -rw-r--r-- 646 bytes
setobject.h -rw-r--r-- 2.9 KB
sliceobject.h -rw-r--r-- 1.3 KB
stringobject.h -rw-r--r-- 7.1 KB
structmember.h -rw-r--r-- 2.6 KB
structseq.h -rw-r--r-- 862 bytes
symtable.h -rw-r--r-- 3.8 KB
sysmodule.h -rw-r--r-- 863 bytes
timefuncs.h -rw-r--r-- 442 bytes
token.h -rw-r--r-- 1.7 KB
traceback.h -rw-r--r-- 697 bytes
tupleobject.h -rw-r--r-- 2.1 KB
ucnhash.h -rw-r--r-- 861 bytes
unicodeobject.h -rw-r--r-- 49.2 KB
warnings.h -rw-r--r-- 635 bytes
weakrefobject.h -rw-r--r-- 2.4 KB

back to top