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/emulator/beam/global.h | |
| 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/emulator/beam/global.h')
| -rwxr-xr-x[-rw-r--r--] | erts/emulator/beam/global.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index fc4c0ba121..894872dbc0 100644..100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -173,6 +173,7 @@ struct port { char *name; /* String used in the open */ erts_driver_t* drv_ptr; UWord drv_data; + SWord os_pid; /* Child process ID */ ErtsProcList *suspended; /* List of suspended processes. */ LineBuf *linebuf; /* Buffer to hold data not ready for process to get (line oriented I/O)*/ |