File 1903-erpc_SUITE-Test-against-an-ei-node-instead... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1903-erpc_SUITE-Test-against-an-ei-node-instead-of-an-OTP.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Currently displaying revision 57cf7c87cb80e2aaaf3f20327bf57529 , Show latest

From 31c7ed2f91496f46b6152bfd3a4739af6d9425eb Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Fri, 8 Oct 2021 23:24:49 +0200
Subject: [PATCH 03/10] erpc_SUITE: Test against an ei node instead of an OTP
 22 node

---
 lib/kernel/test/erpc_SUITE.erl               | 240 +++++++++++++------
 lib/kernel/test/erpc_SUITE_data/Makefile.src |  39 +++
 lib/kernel/test/erpc_SUITE_data/fwd_node.c   | 205 ++++++++++++++++
 3 files changed, 416 insertions(+), 68 deletions(-)
 create mode 100644 lib/kernel/test/erpc_SUITE_data/Makefile.src
 create mode 100644 lib/kernel/test/erpc_SUITE_data/fwd_node.c

diff --git a/lib/kernel/test/erpc_SUITE.erl b/lib/kernel/test/erpc_SUITE.erl
index b1e8ab7c75..5b71cdc96f 100644
--- a/lib/kernel/test/erpc_SUITE.erl
+++ b/lib/kernel/test/erpc_SUITE.erl
@@ -21,12 +21,12 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
--export([call/1, call_reqtmo/1, call_against_old_node/1, cast/1,
+-export([call/1, call_reqtmo/1, call_against_ei_node/1, cast/1,
          send_request/1, send_request_fun/1,
          send_request_receive_reqtmo/1,
          send_request_wait_reqtmo/1,
          send_request_check_reqtmo/1,
-         send_request_against_old_node/1,
+         send_request_against_ei_node/1,
          multicall/1, multicall_reqtmo/1,
          multicall_recv_opt/1,
          multicall_recv_opt2/1,
@@ -48,14 +48,14 @@ suite() ->
 all() -> 
     [call,
      call_reqtmo,
-     call_against_old_node,
+     call_against_ei_node,
      cast,
      send_request,
      send_request_fun,
      send_request_receive_reqtmo,
      send_request_wait_reqtmo,
      send_request_check_reqtmo,
-     send_request_against_old_node,
+     send_request_against_ei_node,
      multicall,
      multicall_reqtmo,
      multicall_recv_opt,
@@ -314,20 +314,20 @@ call_func5(A, B, N, T) when N >= 0 ->
 call_func5(_A, _B, _N, _T) ->
     erlang:error(badarg).
 
-call_against_old_node(Config) ->
-    case start_22_node(Config) of
-        {ok, Node22} ->
+call_against_ei_node(Config) when is_list(Config) ->
+    case start_ei_node(Config) of
+        {error, notsup} ->
+            {skipped, "Test not supported on this platform"};
+        {ok, Node} ->
             try
-                erpc:call(Node22, erlang, node, []),
+                erpc:call(Node, erlang, node, []),
                 ct:fail(unexpected)
             catch
                 error:{erpc, notsup} ->
                     ok
             end,
-            stop_node(Node22),
-            ok;
-        _ ->
-	    {skipped, "No OTP 22 available"}
+            stop_ei_node(Node),
+            ok
     end.
 
 call_reqtmo(Config) when is_list(Config) ->
@@ -446,19 +446,20 @@ cast(Config) when is_list(Config) ->
     receive after 1000 -> ok end,
     [] = flush([]),
 
-    case start_22_node(Config) of
-        {ok, Node22} ->
-            ok = erpc:cast(Node, erlang, send, [Me, wont_reach_me]),
-            ok = erpc:cast(Node, fun () -> Me ! wont_reach_me end),
+    
+    case start_ei_node(Config) of
+        {error, notsup} ->
+            {comment, "No ei node tested; not supported on this platform"};
+        {ok, EiNode} ->
+            ok = erpc:cast(EiNode, erlang, send, [Me, wont_reach_me]),
+            ok = erpc:cast(EiNode, fun () -> Me ! wont_reach_me end),
             receive
                 Msg -> ct:fail({unexpected_message, Msg})
             after
                 2000 -> ok
             end,
-            stop_node(Node22),
-            {comment, "Tested against OTP 22 as well"};
-        _ ->
-            {comment, "No tested against OTP 22"}
+            stop_ei_node(EiNode),
+            {comment, "Also tested against ei node"}
     end.
 
 send_request(Config) when is_list(Config) ->
@@ -551,7 +552,9 @@ send_request(Config) when is_list(Config) ->
 
     [] = flush([]),
 
-    case start_22_node(Config) of
+    case start_ei_node(Config) of
+        {error, notsup} ->
+            {comment, "No ei node tested; not supported on this platform"};
         {ok, Node5} ->
             ReqId9 = erpc:send_request(Node5, erlang, node, []),
             try
@@ -561,13 +564,11 @@ send_request(Config) when is_list(Config) ->
                 error:{erpc, notsup} -> ok
             end,
 
-            stop_node(Node5),
+            stop_ei_node(Node5),
 
             [] = flush([]),
 
-            ok;
-        _ ->
-            {comment, "No test against OTP 22 node performed"}
+            {comment, "Also tested against ei node"}
     end.
 
 send_request_fun(Config) when is_list(Config) ->
@@ -659,7 +660,9 @@ send_request_fun(Config) when is_list(Config) ->
 
     [] = flush([]),
 
-    case start_22_node(Config) of
+    case start_ei_node(Config) of
+        {error, notsup} ->
+            {comment, "No ei node tested; not supported on this platform"};
         {ok, Node5} ->
             ReqId9 = erpc:send_request(Node5, fun () -> erlang:node() end),
             try
@@ -669,13 +672,11 @@ send_request_fun(Config) when is_list(Config) ->
                 error:{erpc, notsup} -> ok
             end,
 
-            stop_node(Node5),
+            stop_ei_node(Node5),
 
             [] = flush([]),
 
-            ok;
-        _ ->
-            {comment, "No test against OTP 22 node performed"}
+            {comment, "Also tested against ei node"}
     end.
 
 
@@ -725,12 +726,14 @@ send_request_check_reqtmo(Config) when is_list(Config) ->
           end,
     reqtmo_test(Config, Fun).
 
-send_request_against_old_node(Config) when is_list(Config) ->
-    case start_22_node(Config) of
-        {ok, Node22} ->
-            RID1 = erpc:send_request(Node22, erlang, node, []),
-            RID2 = erpc:send_request(Node22, erlang, node, []),
-            RID3 = erpc:send_request(Node22, erlang, node, []),
+send_request_against_ei_node(Config) when is_list(Config) ->
+    case start_ei_node(Config) of
+        {error, notsup} ->
+	    {skipped, "Not supported on this platform"};
+        {ok, EiNode} ->
+            RID1 = erpc:send_request(EiNode, erlang, node, []),
+            RID2 = erpc:send_request(EiNode, erlang, node, []),
+            RID3 = erpc:send_request(EiNode, erlang, node, []),
             try
                 erpc:receive_response(RID1),
                 ct:fail(unexpected)
@@ -755,19 +758,17 @@ send_request_against_old_node(Config) when is_list(Config) ->
                 error:{erpc, notsup} ->
                     ok
             end,
-            stop_node(Node22),
-            ok;
-        _ ->
-	    {skipped, "No OTP 22 available"}
+            stop_ei_node(EiNode),
+            ok
     end.
 
 multicall(Config) ->
     {ok, Node1} = start_node(Config),
     {ok, Node2} = start_node(Config),
-    {Node3, Node3Res} = case start_22_node(Config) of
+    {Node3, Node3Res} = case start_ei_node(Config) of
                             {ok, N3} ->
                                 {N3, {error, {erpc, notsup}}};
-                            _ ->
+                            {error, notsup} ->
                                 {ok, N3} = start_node(Config),
                                 stop_node(N3),
                                 {N3, {error, {erpc, noconnection}}}
@@ -1063,12 +1064,12 @@ multicall(Config) ->
 
     [] = flush([]),
 
-    stop_node(Node3),
     case Node3Res of
         {error, {erpc, notsup}} ->
-            {comment, "Tested against an OTP 22 node as well"};
+            stop_ei_node(Node3),
+            {comment, "Also tested against an ei node"};
         _ ->
-            {comment, "No OTP 22 node available; i.e., only testing against current release"}
+            {comment, "No ei node available; i.e., only testing against proper erlang nodes"}
     end.
 
 multicall_reqtmo(Config) when is_list(Config) ->
@@ -1257,19 +1258,19 @@ multicast(Config) when is_list(Config) ->
     receive after 1000 -> ok end,
 
     [] = flush([]),
-    case start_22_node(Config) of
-        {ok, Node22} ->
-            ok = erpc:multicast([Node], erlang, send, [Me, wont_reach_me]),
-            ok = erpc:multicast([Node], fun () -> Me ! wont_reach_me end),
+    case start_ei_node(Config) of
+        {error, notsup} ->
+            {comment, "No ei node tested; not supported on this platform"};
+        {ok, EiNode} ->
+            ok = erpc:multicast([EiNode], erlang, send, [Me, wont_reach_me]),
+            ok = erpc:multicast([EiNode], fun () -> Me ! wont_reach_me end),
             receive
                 Msg -> ct:fail({unexpected_message, Msg})
             after
                 2000 -> ok
             end,
-            stop_node(Node22),
-            {comment, "Tested against OTP 22 as well"};
-        _ ->
-            {comment, "No tested against OTP 22"}
+            stop_ei_node(EiNode),
+            {comment, "Also tested against ei node"}
     end.
 
 timeout_limit(Config) when is_list(Config) ->
@@ -1341,24 +1342,117 @@ start_node(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     test_server:start_node(Name, slave, [{args,  "-pa " ++ Pa}]).
 
-start_22_node(Config) ->
-    Rel = "22_latest",
-    case test_server:is_release_available(Rel) of
-	false ->
-            notsup;
-        true ->
+start_ei_node(Config) when is_list(Config) ->
+    case os:type() of
+        {win32, _} ->
+            {error, notsup};
+        _ ->
+            DataDir = proplists:get_value(data_dir, Config),
+            FwdNodeExe = filename:join(DataDir, "fwd_node"),
+            Name = atom_to_list(?MODULE)
+                ++ "-" ++ atom_to_list(proplists:get_value(testcase, Config))
+                ++ "-" ++ "ei_node"
+                ++ "-" ++ integer_to_list(erlang:system_time(second))
+                ++ "-" ++ integer_to_list(erlang:unique_integer([positive])),
             Cookie = atom_to_list(erlang:get_cookie()),
-            Name = list_to_atom(atom_to_list(?MODULE)
-                                ++ "-" ++ atom_to_list(proplists:get_value(testcase, Config))
-                                ++ "-" ++ integer_to_list(erlang:system_time(second))
-                                ++ "-" ++ integer_to_list(erlang:unique_integer([positive]))),
-            Pa = filename:dirname(code:which(?MODULE)),
-	    test_server:start_node(Name,
-                                   peer,
-                                   [{args, "-pa " ++ Pa ++ " -setcookie "++Cookie},
-                                    {erl, [{release, Rel}]}])
+            HostName = get_hostname(),
+            Node = list_to_atom(Name++"@"++HostName),
+            Creation = integer_to_list(rand:uniform((1 bsl 15) - 4) + 3),
+            Parent = self(),
+            Pid = spawn_link(fun () ->
+                                     register(cnode_forward_receiver, self()),
+                                     process_flag(trap_exit, true),
+                                     Cmd = FwdNodeExe
+                                         ++ " -sname " ++ Name
+                                         ++ " -cookie " ++ Cookie
+                                         ++ " -creation " ++ Creation,
+                                     io:format("Starting ei_node: ~p~n", [Cmd]),
+                                     Port = erlang:open_port({spawn, Cmd}, [use_stdio]),
+                                     receive
+                                         {Port, {data, "accepting"}} -> ok
+                                     end,
+                                     ei_node_handler_loop(Node, Parent, Port)
+                             end),
+            put({ei_node_handler, Node}, Pid),
+            case check_ei_node(Node) of
+                ok -> {ok, Node};
+                Error -> Error
+            end
     end.
 
+check_ei_node(Node) ->
+    Key = {ei_node_handler, Node},
+    case get(Key) of
+        undefined ->
+            {error, no_handler};
+        Pid when is_pid(Pid) ->
+            Pid ! {check_node, self()},
+            receive
+                {check_node, Pid, Res} ->
+                    Res
+            after 3000 ->
+                    {error, no_handler_response}
+            end
+    end.
+
+stop_ei_node(Node) ->
+    case check_ei_node(Node) of
+        ok ->
+            Key = {ei_node_handler, Node},
+            case get(Key) of
+                undefined ->
+                    {error, no_handler};
+                Pid when is_pid(Pid) ->
+                    Pid ! {stop_node, self()},
+                    receive
+                        {stop_node, Pid} ->
+                            put(Key, undefined),
+                            ok
+                    after 2000 ->
+                            {error, no_handler_response}
+                    end
+            end;
+        Error ->
+            Error
+    end.
+
+ei_node_handler_loop(Node, Parent, Port) ->
+    receive
+        {'EXIT', Parent, Reason} ->
+            erlang:disconnect_node(Node),
+            (catch port_close(Port)),
+            exit(Reason);
+        {stop_node, Parent} ->
+            erlang:disconnect_node(Node),
+            (catch port_close(Port)),
+            Parent ! {stop_node, self()},
+            exit(normal);
+        {check_node, Parent} ->
+            Ref = make_ref(),
+            {a_name, Node} ! Ref,
+            receive
+                Ref ->
+                    Parent ! {check_node, self(), ok}
+            after
+                2000 ->
+                    Parent ! {check_node, self(), {error, no_node_response}}
+            end;
+        Msg ->
+            Msgs = fetch_all_messages([Msg]),
+            erlang:disconnect_node(Node),
+            (catch port_close(Port)),
+            exit({ei_node_handler, Node, unexpected_messages, Msgs})
+    end,
+    ei_node_handler_loop(Node, Parent, Port).
+
+get_hostname() ->
+    get_hostname(atom_to_list(node())).
+
+get_hostname([$@ | HostName]) ->
+    HostName;
+get_hostname([_ | Rest]) ->
+    get_hostname(Rest).
+
 stop_node(Node) ->
     test_server:stop_node(Node).
 
@@ -1392,3 +1486,13 @@ flush_msgq(N) ->
     after 0 ->
 	    N
     end.
+
+fetch_all_messages(Msgs) ->
+    receive
+        Msg ->
+            fetch_all_messages([Msg|Msgs])
+    after
+        0 ->
+            Msgs
+    end.
+
diff --git a/lib/kernel/test/erpc_SUITE_data/Makefile.src b/lib/kernel/test/erpc_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..0f59ee0b05
--- /dev/null
+++ b/lib/kernel/test/erpc_SUITE_data/Makefile.src
@@ -0,0 +1,39 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2021. All Rights Reserved.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# 
+# %CopyrightEnd%
+#
+
+include @erl_interface_mk_include@
+
+CC = @CC@
+LD = @LD@
+
+CFLAGS = @EI_CFLAGS@ $(THR_DEFS) -I@erl_interface_include@ 
+
+LIBEI = @erl_interface_eilib@
+LIBFLAGS = $(LIBEI) @LIBS@ @erl_interface_sock_libs@ @erl_interface_threadlib@
+
+all: fwd_node@exe@
+
+fwd_node@exe@: fwd_node@obj@ $(LIBEI)
+	$(LD) @CROSSLDFLAGS@ -o $@ fwd_node@obj@ $(LIBFLAGS)
+
+clean:
+	$(RM) fwd_node@obj@
+	$(RM) fwd_node@exe@
+
diff --git a/lib/kernel/test/erpc_SUITE_data/fwd_node.c b/lib/kernel/test/erpc_SUITE_data/fwd_node.c
new file mode 100644
index 0000000000..6cc0b5dbf4
--- /dev/null
+++ b/lib/kernel/test/erpc_SUITE_data/fwd_node.c
@@ -0,0 +1,205 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2021. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifndef __WIN32__
+#include <unistd.h>
+#include <errno.h>
+#include <pthread.h>
+#endif
+#include "ei.h"
+
+static void usage1(char *what);
+static void usage2(char *what, char *val);
+static void fail1(char *what);
+
+char *progname;
+ei_cnode cnode;
+char *node_name = NULL;
+char *cookie = NULL;
+short creation = -1;
+
+#ifndef __WIN32__
+
+static void *ei_node_executor(void *unused)
+{
+    int lfd, pfd, res, port;
+
+    ei_init();
+    res = ei_connect_init(&cnode, node_name, cookie, creation);
+    if (res < 0)
+        fail1("ei_connect_init");
+    port = 0;
+    lfd = ei_listen(&cnode, &port, 5);
+    if (lfd < 0)
+	fail1("ei_listen");
+    pfd = ei_publish(&cnode, port);
+    if (pfd < 0)
+	fail1("ei_publish");
+
+    printf("accepting");
+    fflush(stdout);
+
+    while (!0)  {
+        ErlConnect conn;
+        int afd = ei_accept(&cnode, lfd, &conn);
+        if (afd < 0)
+            fail1("ei_accept");
+
+        while (!0) {
+            ei_x_buff x;
+            erlang_msg msg;
+            ei_x_new(&x);
+            do {
+                res = ei_xreceive_msg(afd, &msg, &x);
+            } while (res == ERL_TICK);
+            if (res != ERL_MSG) {
+                /* connection closed... */
+                ei_close_connection(afd);
+                break;
+            }
+
+            switch (msg.msgtype) {
+            case ERL_SEND:
+            case ERL_REG_SEND:
+                ei_send_reg_encoded(afd, &cnode.self, "cnode_forward_receiver",
+                                    x.buff, x.index);
+                break;
+            case ERL_LINK:
+                fail1("received link");
+                break;
+            case ERL_UNLINK:
+                fail1("received unlink");
+                break;
+            case ERL_EXIT:
+                fail1("received exit");
+                break;
+            default:
+                fail1("received invalid signal");
+                break;
+            }
+            ei_x_free(&x);
+        }
+    }
+    
+    return NULL;
+}
+
+#endif
+
+int
+main(int argc, char *argv[])
+{
+#ifndef __WIN32__
+    pthread_t tid;
+#endif
+    int i;
+    
+    progname = argv[0];
+    i = 1;
+    while (i < argc) {
+        if (strcmp(argv[i], "-sname") == 0) {
+            i++;
+            if (i == argc)
+                usage1("Missing -sname value");
+            node_name = argv[i];
+        }
+        else if (strcmp(argv[i], "-cookie") == 0) {
+            i++;
+            if (i == argc)
+                usage1("Missing -cookie value");
+            cookie = argv[i];
+        }
+        else if (strcmp(argv[i], "-creation") == 0) {
+            char *endp;
+            long int val;
+            i++;
+            if (i == argc)
+                usage1("Missing -creation value");
+            val = strtol(argv[i], &endp, 10);
+            creation = (short) val;
+            if (*endp != '\0' || creation < 4)
+                usage2("Invalid creation", argv[i]);
+        }
+        else {
+            usage2("Unkown parameter", argv[i]);
+        }
+        i++;
+    }
+
+    if (!node_name)
+        usage1("Missing -sname parameter");
+    if (!cookie)
+        usage1("Missing -cookie parameter");
+    if (creation < 0)
+        usage1("Missing -creation parameter");
+
+#ifdef __WIN32__
+    fail1("Not supported on windows");
+#else
+    if (pthread_create(&tid, NULL, ei_node_executor, NULL) != 0)
+        fail1("pthread_create() failed");
+    
+    /* Wait until stdin is closed. Terminate when that happens... */
+    while (!0) {
+        char buf[128];
+        ssize_t res = read(0, (void *) &buf[0], sizeof(buf));
+        if (res == 0)
+            exit(0); /* erlang port closed... */
+        if (res < 0 && errno != EINTR) {
+            fail1("read() failed");
+        }
+    }
+#endif
+
+    return 0;
+}
+
+static void
+usage1(char *what)
+{
+    fprintf(stderr,
+            "ERROR: %s\n\n"
+            "  Usage:\n"
+            "    %s -sname <node name> -cookie <cookie> -creation <creation>\n",
+            what, progname);
+    exit(1);
+}
+
+static void
+usage2(char *what, char *val)
+{
+    fprintf(stderr,
+            "ERROR: %s: %s\n\n"
+            "  Usage:\n"
+            "    %s -sname <node name> -cookie <cookie> -creation <creation>\n",
+            what, val, progname);
+    exit(1);
+}
+
+static void
+fail1(char *what)
+{
+    fprintf(stderr, "%s FAILED: %s; %d\n",
+            cnode.thisalivename, what, erl_errno);
+    exit(1);
+}
-- 
2.31.1

Places

File 1903-erpc_SUITE-Test-against-an-ei-node-instead-of-an-OTP.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Places