diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-04-20 18:33:29 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-04-20 18:33:29 (GMT) |
| commit | 32f4db3175a88f21a90791eafe01cac6d763877d (patch) | |
| tree | 93bc8d0c8cf13646d5199d36313c08eb1765b789 /Doc | |
| parent | c1ceb64e41082282f2e3d28065f5ae1e03fa78ae (diff) | |
| parent | 861d27f4cff8f2a82ebbb20090b49e754f1135c1 (diff) | |
| download | cpython-32f4db3175a88f21a90791eafe01cac6d763877d.zip cpython-32f4db3175a88f21a90791eafe01cac6d763877d.tar.gz cpython-32f4db3175a88f21a90791eafe01cac6d763877d.tar.bz2 | |
Merge with 3.2.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/c-api/init.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst index 535bf12..9a78834 100644 --- a/Doc/c-api/init.rst +++ b/Doc/c-api/init.rst @@ -489,7 +489,7 @@ the fork, and releasing them afterwards. In addition, it resets any :ref:`lock-objects` in the child. When extending or embedding Python, there is no way to inform Python of additional (non-Python) locks that need to be acquired before or reset after a fork. OS facilities such as -:c:func:`posix_atfork` would need to be used to accomplish the same thing. +:c:func:`pthread_atfork` would need to be used to accomplish the same thing. Additionally, when extending or embedding Python, calling :c:func:`fork` directly rather than through :func:`os.fork` (and returning to or calling into Python) may result in a deadlock by one of Python's internal locks |