mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 78527,78531 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78527 | gregory.p.smith | 2010-02-28 17:22:39 -0800 (Sun, 28 Feb 2010) | 4 lines

  Issue #7242: On Solaris 9 and earlier calling os.fork() from within a
  thread could raise an incorrect RuntimeError about not holding the import
  lock.  The import lock is now reinitialized after fork.
........
  r78531 | gregory.p.smith | 2010-02-28 18:31:33 -0800 (Sun, 28 Feb 2010) | 2 lines

  Fix for r78527.  It left out updating forkpty.
........
This commit is contained in:
Gregory P. Smith 2010-03-01 04:40:36 +00:00
parent 56f1682a44
commit c21d0cb6cf
4 changed files with 76 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/import.c
View file

@ -298,15 +298,17 @@ _PyImport_ReleaseLock(void)
}
/* This function is called from PyOS_AfterFork to ensure that newly
created child processes do not share locks with the parent. */
created child processes do not share locks with the parent.
We now acquire the import lock around fork() calls but on some platforms
(Solaris 9 and earlier? see isue7242) that still left us with problems. */
void
_PyImport_ReInitLock(void)
{
#ifdef _AIX
if (import_lock != NULL)
import_lock = PyThread_allocate_lock();
#endif
if (import_lock != NULL)
import_lock = PyThread_allocate_lock();
import_lock_thread = -1;
import_lock_level = 0;
}
#endif