diff options
| author | Björn Gustavsson <[email protected]> | 2016-04-07 15:45:25 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-04-07 15:45:25 +0200 |
| commit | 89b762d4c9332a9a6416ff8b4f9ea5f6b9179779 (patch) | |
| tree | 93a00896d037a29890f9c8ffa4ef8ec3159549dd | |
| parent | 5b15c7747c38defc3d7c5ee2e9de58b9f2fed535 (diff) | |
| parent | 8894ff896d45a5aeb720378f66d15eef4db8593b (diff) | |
| download | otp-89b762d4c9332a9a6416ff8b4f9ea5f6b9179779.tar.gz otp-89b762d4c9332a9a6416ff8b4f9ea5f6b9179779.tar.bz2 otp-89b762d4c9332a9a6416ff8b4f9ea5f6b9179779.zip | |
Merge branch 'bjorn/kernel/rpc-pinfo/ERL-124/OTP-13460'
* bjorn/kernel/rpc-pinfo/ERL-124/OTP-13460:
Update spec for rpc:pinfo/2
| -rw-r--r-- | lib/kernel/doc/src/rpc.xml | 3 | ||||
| -rw-r--r-- | lib/kernel/src/rpc.erl | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/rpc.xml b/lib/kernel/doc/src/rpc.xml index be1641ffd9..f8d81d749d 100644 --- a/lib/kernel/doc/src/rpc.xml +++ b/lib/kernel/doc/src/rpc.xml @@ -325,7 +325,8 @@ </func> <func> - <name name="pinfo" arity="2"/> + <name name="pinfo" arity="2" clause_i="1"/> + <name name="pinfo" arity="2" clause_i="2"/> <fsummary>Information about a process.</fsummary> <desc> <p>Location transparent version of the BIF diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl index 0e1e3f070c..5f83713cf7 100644 --- a/lib/kernel/src/rpc.erl +++ b/lib/kernel/src/rpc.erl @@ -727,6 +727,11 @@ pinfo(Pid) -> -spec pinfo(Pid, Item) -> {Item, Info} | undefined | [] when Pid :: pid(), Item :: atom(), + Info :: term(); + (Pid, ItemList) -> [{Item, Info}] | undefined | [] when + Pid :: pid(), + Item :: atom(), + ItemList :: [Item], Info :: term(). pinfo(Pid, Item) when node(Pid) =:= node() -> |