diff options
| author | Sverker Eriksson <[email protected]> | 2018-07-11 22:10:14 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-07-11 22:10:14 +0200 |
| commit | 97626fffd082904576efbdad3e437720525d5fc2 (patch) | |
| tree | d95e1b2ce2cd02122016c4ddf41c6950ddde8b08 /erts/preloaded | |
| parent | f138bdd545d90689a610a70cd982bb99d9c57903 (diff) | |
| parent | 0c63aea9fe16372d827c93fc553148a7c92b9329 (diff) | |
| download | otp-97626fffd082904576efbdad3e437720525d5fc2.tar.gz otp-97626fffd082904576efbdad3e437720525d5fc2.tar.bz2 otp-97626fffd082904576efbdad3e437720525d5fc2.zip | |
Merge branch 'sverker/erts/monitored_by-docs/ERL-648/OTP-15180' into maint
* sverker/erts/monitored_by-docs/ERL-648/OTP-15180:
os_mon: Fix volatile test cpu_sup_SUITE:util_api
erts: Fix spec and docs for process_info 'monitored_by'
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 75f6901258..1ed6b6b284 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -86,15 +86,15 @@ | 'nano_seconds'. -opaque prepared_code() :: reference(). - -export_type([prepared_code/0]). --opaque dist_handle() :: atom(). +-opaque nif_resource() :: reference(). +-export_type([nif_resource/0]). +-opaque dist_handle() :: atom(). -export_type([dist_handle/0]). -type iovec() :: [binary()]. - -export_type([iovec/0]). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2316,7 +2316,7 @@ process_flag(_Flag, _Value) -> {min_heap_size, MinHeapSize :: non_neg_integer()} | {min_bin_vheap_size, MinBinVHeapSize :: non_neg_integer()} | {max_heap_size, MaxHeapSize :: max_heap_size()} | - {monitored_by, Pids :: [pid()]} | + {monitored_by, MonitoredBy :: [pid() | port() | nif_resource()]} | {monitors, Monitors :: [{process | port, Pid :: pid() | port() | {RegName :: atom(), Node :: node()}}]} | |