mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 78527,78550 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.
........
  r78550 | gregory.p.smith | 2010-02-28 22:01:02 -0800 (Sun, 28 Feb 2010) | 2 lines

  Fix test to be skipped on windows.
........
This commit is contained in:
Gregory P. Smith 2010-03-01 06:18:41 +00:00
parent c78d79ce30
commit 24cec9fe07
4 changed files with 72 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/import.c
View file

@ -295,14 +295,18 @@ _PyImport_ReleaseLock(void)
return 1;
}
/* This function used to be called from PyOS_AfterFork to ensure that newly
created child processes do not share locks with the parent, but for some
reason only on AIX systems. Instead of re-initializing the lock, we now
acquire the import lock around fork() calls. */
/* This function is called from PyOS_AfterFork to ensure that newly
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)
{
if (import_lock != NULL)
import_lock = PyThread_allocate_lock();
import_lock_thread = -1;
import_lock_level = 0;
}
#endif