diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-04-20 18:32:40 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-04-20 18:32:40 (GMT) |
| commit | 861d27f4cff8f2a82ebbb20090b49e754f1135c1 (patch) | |
| tree | e87aa692cfa4cfb26fd9c1b1e25ea0787e7f6374 /Doc | |
| parent | 6159ee3cf59b3fd8fcf9818c0a8071362d1ad7c2 (diff) | |
| parent | e4027249127ad7150892d528978b2862a78c6284 (diff) | |
| download | cpython-861d27f4cff8f2a82ebbb20090b49e754f1135c1.zip cpython-861d27f4cff8f2a82ebbb20090b49e754f1135c1.tar.gz cpython-861d27f4cff8f2a82ebbb20090b49e754f1135c1.tar.bz2 | |
Merge with 3.1.
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 |