Mercurial > cpython-lru_cache-weakref
diff Python/import.c @ 59235:58c35495a934
Merged revisions 78527,78550 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.
........
r78550 | gregory.p.smith | 2010-02-28 22:01:02 -0800 (Sun, 28 Feb 2010) | 2 lines
Fix test to be skipped on windows.
........
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Mon, 01 Mar 2010 06:18:41 +0000 |
| parents | 370e1a1c2386 |
| children | 42261c6ca564 |
line wrap: on
line diff
--- a/Python/import.c Mon Mar 01 05:54:14 2010 +0000 +++ b/Python/import.c Mon Mar 01 06:18:41 2010 +0000 @@ -295,14 +295,18 @@ 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