diff options
| author | Patrik Nyblom <[email protected]> | 2012-04-17 16:15:11 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-04-17 16:19:49 +0200 |
| commit | b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce (patch) | |
| tree | e4e6afa0a9a395aec7651c0d56c0f782163c1d5f /erts/doc | |
| parent | f1a49c45e4b2ec746407fd777ba31fec6cab118e (diff) | |
| parent | d6d38a42650880bcd6c1f93c5797958857e82d60 (diff) | |
| download | otp-b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce.tar.gz otp-b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce.tar.bz2 otp-b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce.zip | |
Merge branch 'pg/r15/add-os-pid-to-port-info' into maint
* pg/r15/add-os-pid-to-port-info:
tests: Remove line macro from port_bif_SUITE
Correct documentation, erl_bif_types and dialyzer tests
Make port_info(Port,os_pid) work on Windows
Extend erlang:port_info/1,2 to show the OS pid of a spawned process
OTP-10057
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/erlang.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 0963904b83..cfc7fff3af 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -3573,6 +3573,10 @@ os_prompt% </pre> <p><c>Bytes</c> is the total number of bytes written to the port.</p> </item> + <tag><c>{os_pid, Integer | undefined}</c></tag> + <item> + <p><c>Integer</c> is the process identifier (or equivalent) of an OS process created with <c>open_port({spawn | spawn_executable, Command}, Options)</c>. If the port is not the result of spawning an OS process, the value is <c>undefined</c>.</p> + </item> </taglist> <p>Failure: <c>badarg</c> if <c>Port</c> is not a local port.</p> </desc> |