Mercurial > cpython-lru_cache-weakref
diff Python/import.c @ 59226:d5f50ae4f1f7 2.6
Merged revisions 78527,78531 via svnmerge from
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.
........
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Mon, 01 Mar 2010 04:40:36 +0000 |
| parents | 1ad9f2bda20a |
| children | 8d8c9bf2a04e |
line wrap: on
line diff
--- a/Python/import.c Mon Mar 01 04:05:56 2010 +0000 +++ b/Python/import.c Mon Mar 01 04:40:36 2010 +0000 @@ -298,15 +298,17 @@ } /* 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