diff options
| author | Sverker Eriksson <[email protected]> | 2018-07-09 18:23:35 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-07-09 18:36:41 +0200 |
| commit | 6fdcb401a0de580fba38eec63a92b45ee73c8b64 (patch) | |
| tree | d358f93839e04dcc831219b9723ed06d7e087e4f /erts/doc | |
| parent | a409990bbe6bbe75be274161855e2f68a48100e6 (diff) | |
| download | otp-6fdcb401a0de580fba38eec63a92b45ee73c8b64.tar.gz otp-6fdcb401a0de580fba38eec63a92b45ee73c8b64.tar.bz2 otp-6fdcb401a0de580fba38eec63a92b45ee73c8b64.zip | |
erts: Fix spec and docs for process_info 'monitored_by'
to include ports and NIF resources.
Added new opaque type 'nif_resource'.
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/erl_nif.xml | 2 | ||||
| -rw-r--r-- | erts/doc/src/erlang.xml | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml index a8eff43623..0fff8f7cad 100644 --- a/erts/doc/src/erl_nif.xml +++ b/erts/doc/src/erl_nif.xml @@ -194,7 +194,7 @@ ok <p>Binaries are sequences of whole bytes. Bitstrings with an arbitrary bit length have no support yet.</p> </item> - <tag>Resource objects</tag> + <tag><marker id="resource_objects"/>Resource objects</tag> <item> <p>The use of resource objects is a safe way to return pointers to native data structures from a NIF. A resource object is diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 73800687b7..8e014c3010 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -197,6 +197,15 @@ </desc> </datatype> + <datatype> + <name name="nif_resource"></name> + <desc> + <p>An opaque handle identifing a + <seealso marker="erl_nif#resource_objects">NIF resource object + </seealso>.</p> + </desc> + </datatype> + </datatypes> <funcs> @@ -5288,10 +5297,10 @@ RealSystem = system + MissedSystem</code> <p><c><anno>MinBinVHeapSize</anno></c> is the minimum binary virtual heap size for the process.</p> </item> - <tag><c>{monitored_by, <anno>Pids</anno>}</c></tag> + <tag><c>{monitored_by, <anno>MonitoredBy</anno>}</c></tag> <item> - <p>A list of process identifiers monitoring the process (with - <c>monitor/2</c>).</p> + <p>A list of identifiers for all the processes, ports and NIF + resources, that are monitoring the process.</p> </item> <tag><c>{monitors, <anno>Monitors</anno>}</c></tag> <item> |