File 3051-monitor_node-2-Raise-notalive-instead-of-b... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3051-monitor_node-2-Raise-notalive-instead-of-badarg.patch of Package erlang

From 0b5d85a717294d69d79dbec024a32f4dabb7efa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 29 Oct 2020 10:20:54 +0100
Subject: [PATCH] monitor_node/2: Raise 'notalive' instead of 'badarg'

The `monitor_node/2` BIF raises a `badarg` exception when the
node is not alive. This commit changes `monitor_node/2` to
instead raise a `notalive` exception in that situation.

Specification
-------------

Currently, `monitor_node/2` raises a `badarg` exception when
the node is not distributed (not alive):

1> monitor_node(node@host, true).
    ** exception error: bad argument
         in function  monitor_node/2
            called as monitor_node(node@host,true)

Change that to raise a `notalive` exception:

1> monitor_node(node@host, true).
    ** exception error: the node cannot be part of a distributed system
         in function  monitor_node/2
            called as monitor_node(node@host,true)
    2> catch monitor_node(node@host, true).
    {'EXIT',{notalive,[{erlang,monitor_node,[node@host,true],[]},
                       {erl_eval,do_apply,6,[{file,"erl_eval.erl"},{line,684}]},
                       {erl_eval,expr,5,[{file,"erl_eval.erl"},{line,437}]},
                       {shell,exprs,7,[{file,"shell.erl"},{line,686}]},
                       {shell,eval_exprs,7,[{file,"shell.erl"},{line,642}]},
                       {shell,eval_loop,3,[{file,"shell.erl"},{line,627}]}]}}

Motivation
----------

`badarg` is illogical if there is nothing wrong with the arguments. To
avoid confusion, it is better to only raise a `badarg` exception if
the arguments are bad.

Backwards Compatibility
-----------------------

Applications or libraries that catch the exception from
`monitor_nodes/2` and expect the exception reason to always be
`badarg` will need to be updated. However, in practice, there is
probably little or no code that does that. If an application uses
`monitor_node/2`, it probably expects that the distribution is
enabled.
---
 erts/doc/src/erlang.xml   | 2 +-
 erts/emulator/beam/dist.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 0f31f49121..872497b9b3 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -4031,7 +4031,7 @@ RealSystem = system + MissedSystem</code>
 <c>net_kernel:monitor_nodes/1</c></seemfa>.
 Nodes connected through hidden connections can be monitored
 as any other nodes.
- Failure: <c>badarg</c> if the local node is not alive.
+ Failure: <c>notalive</c> if the local node is not alive.
 </desc>
 </func>
 
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index ab04241e8e..f6efcabc8d 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -5801,8 +5801,10 @@ monitor_node(Process* p, Eterm Node, Eterm Bool, Eterm Options)
 if (is_not_atom(Node))
 goto badarg;
 
- if (erts_this_node->sysname == am_Noname && Node != am_Noname)
-	goto badarg;
+ if (erts_this_node->sysname == am_Noname && Node != am_Noname) {
+ ERTS_BIF_PREP_ERROR(ret, p, EXC_NOTALIVE);
+ goto do_return;
+ }
 
 switch (Bool) {
 
-- 
2.26.2

Places

File 3051-monitor_node-2-Raise-notalive-instead-of-badarg.patch of Package erlang

Places