erl_interface: Add bitstring and export fun support

9 files changed, 146 insertions, 17 deletions

diff --git a/lib/erl_interface/test/all_SUITE_data/ei_runner.h b/lib/erl_interface/test/all_SUITE_data/ei_runner.h
index 2608661303..7c874ac82e 100644
--- a/lib/erl_interface/test/all_SUITE_data/ei_runner.h
+++ b/lib/erl_interface/test/all_SUITE_data/ei_runner.h
@@ -53,6 +53,7 @@ void free_packet(char*);
 
 #define fail(reason) do_fail(__FILE__, __LINE__, reason)
 #define fail1(reason, a1) do_fail(__FILE__, __LINE__, reason, a1)
+#define fail2(reason, a1, a2) do_fail(__FILE__, __LINE__, reason, a1, a2)
 #define report(ok) do_report(__FILE__, __LINE__, ok)
 
 void do_report(char* file, int line, int ok);
diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl
index 9c9c3f86b6..f40c67375b 100644
--- a/lib/erl_interface/test/ei_accept_SUITE.erl
+++ b/lib/erl_interface/test/ei_accept_SUITE.erl
@@ -43,8 +43,12 @@ init_per_testcase(Case, Config) ->
     runner:init_per_testcase(?MODULE, Case, Config).
 
 ei_accept(Config) when is_list(Config) ->
+    ei_accept_do(Config, 0),   % default
+    ei_accept_do(Config, 21).  % ei_set_compat_rel
+
+ei_accept_do(Config, CompatRel) ->
     P = runner:start(Config, ?interpret),
-    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0, CompatRel),
 
     Myname = hd(tl(string:tokens(atom_to_list(node()), "@"))),
     io:format("Myname ~p ~n",  [Myname]),
@@ -52,15 +56,18 @@ ei_accept(Config) when is_list(Config) ->
     io:format("EINode ~p ~n",  [EINode]),
 
     %% We take this opportunity to also test export-funs and bit-strings
-    %% with (ugly) tuple fallbacks.
+    %% with (ugly) tuple fallbacks in OTP 21 and older.
     %% Test both toward pending connection and established connection.
     RealTerms = [<<1:1>>,     fun lists:map/2],
-    Fallbacks = [{<<128>>,1}, {lists,map}],
+    EncTerms = case CompatRel of
+                   0 -> RealTerms;
+                   21 -> [{<<128>>,1}, {lists,map}]
+                end,
 
     Self = self(),
     Funny = fun() -> hello end,
     TermToSend = {call, Self, "Test", Funny, RealTerms},
-    TermToGet  = {call, Self, "Test", Funny, Fallbacks},
+    TermToGet  = {call, Self, "Test", Funny, EncTerms},
     Port = 6543,
     {ok, ListenFd} = ei_publish(P, Port),
     {any, EINode} ! TermToSend,
@@ -94,7 +101,7 @@ ei_threaded_accept(Config) when is_list(Config) ->
 %% Test erlang:monitor toward erl_interface "processes"
 monitor_ei_process(Config) when is_list(Config) ->
     P = runner:start(Config, ?interpret),
-    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0, 0),
 
     Myname = hd(tl(string:tokens(atom_to_list(node()), "@"))),
     io:format("Myname ~p ~n",  [Myname]),
@@ -167,8 +174,8 @@ start_einode(Einode, N, Host) ->
 
 %%% Interface functions for ei (erl_interface) functions.
 
-ei_connect_init(P, Num, Cookie, Creation) ->
-    send_command(P, ei_connect_init, [Num,Cookie,Creation]),
+ei_connect_init(P, Num, Cookie, Creation, Compat) ->
+    send_command(P, ei_connect_init, [Num,Cookie,Creation,Compat]),
     case get_term(P) of
         {term,Int} when is_integer(Int) -> Int
     end.
diff --git a/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c b/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
index d85b2d38c7..09b0b5440b 100644
--- a/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
+++ b/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
@@ -58,7 +58,7 @@ static struct {
     int num_args;		/* Number of arguments. */
     void (*func)(char* buf, int len);
 } commands[] = {
-    "ei_connect_init",  3, cmd_ei_connect_init,
+    "ei_connect_init",  4, cmd_ei_connect_init,
     "ei_publish", 	1, cmd_ei_publish,
     "ei_accept", 	1, cmd_ei_accept,
     "ei_receive",  	1, cmd_ei_receive,
@@ -106,18 +106,25 @@ TESTCASE(interpret)
 static void cmd_ei_connect_init(char* buf, int len)
 {
     int index = 0, r = 0;
-    long l;
-    char b[100];
+    long num, creation;
+    unsigned long compat;
+    char node_name[100];
     char cookie[MAXATOMLEN], * cp = cookie;
     ei_x_buff res;
-    if (ei_decode_long(buf, &index, &l) < 0)
+    if (ei_decode_long(buf, &index, &num) < 0)
 	fail("expected int");
-    sprintf(b, "c%d", l);
+    sprintf(node_name, "c%d", num);
     if (ei_decode_atom(buf, &index, cookie) < 0)
 	fail("expected atom (cookie)");
     if (cookie[0] == '\0')
 	cp = NULL;
-    r = ei_connect_init(&ec, b, cp, 0);
+    if (ei_decode_long(buf, &index, &creation) < 0)
+	fail("expected int");
+    if (ei_decode_long(buf, &index, &compat) < 0)
+	fail("expected uint");
+    if (compat)
+        ei_set_compat_rel(compat);
+    r = ei_connect_init(&ec, node_name, cp, creation);
     ei_x_new_with_version(&res);
     ei_x_encode_long(&res, r);
     send_bin_term(&res);
diff --git a/lib/erl_interface/test/ei_connect_SUITE.erl b/lib/erl_interface/test/ei_connect_SUITE.erl
index 75b6bf18da..6184ce801b 100644
--- a/lib/erl_interface/test/ei_connect_SUITE.erl
+++ b/lib/erl_interface/test/ei_connect_SUITE.erl
@@ -79,9 +79,10 @@ ei_send_funs(Config) when is_list(Config) ->
     {ok,Fd} = ei_connect(P, node()),
 
     Fun1 = fun ei_send/1,
-    Fun2 = fun(X) -> P, X, Fd, Fun1 end,
+    Fun2 = fun(X) -> {P, X, Fd, Fun1} end,
+    Bits = <<1,2,3:5>>,
 
-    AMsg={Fun1,Fun2},
+    AMsg={Fun1,Fun2,Bits},
     %%AMsg={wait_with_funs, new_dist_format},
     ok = ei_send_funs(P, Fd, self(), AMsg),
     EIMsg = receive M -> M end,
diff --git a/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c b/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c
index b002871ffe..7c9e79f837 100644
--- a/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c
+++ b/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c
@@ -209,6 +209,8 @@ static void cmd_ei_send_funs(char* buf, int len)
     erlang_pid pid;
     ei_x_buff x;
     erlang_fun fun1, fun2;
+    unsigned char bitstring[10];
+    size_t bits;
 
     if (ei_decode_long(buf, &index, &fd) < 0)
 	fail("expected long");
@@ -216,20 +218,24 @@ static void cmd_ei_send_funs(char* buf, int len)
 	fail("expected pid (node)");
     if (ei_decode_tuple_header(buf, &index, &n) < 0)
 	fail("expected tuple");
-    if (n != 2)
+    if (n != 3)
 	fail("expected tuple");
     if (ei_decode_fun(buf, &index, &fun1) < 0)
 	fail("expected Fun1");
     if (ei_decode_fun(buf, &index, &fun2) < 0)
 	fail("expected Fun2");
+    if (ei_decode_bitstring(buf, &index, bitstring, sizeof(bitstring), &bits) < 0)
+	fail("expected bitstring");
     if (ei_x_new_with_version(&x) < 0)
 	fail("ei_x_new_with_version");
-    if (ei_x_encode_tuple_header(&x, 2) < 0)
+    if (ei_x_encode_tuple_header(&x, 3) < 0)
 	fail("encode tuple header");
     if (ei_x_encode_fun(&x, &fun1) < 0)
 	fail("encode fun1");
     if (ei_x_encode_fun(&x, &fun2) < 0)
 	fail("encode fun2");
+    if (ei_x_encode_bitstring(&x, bitstring, bits) < 0)
+	fail("encode bitstring");
     free_fun(&fun1);
     free_fun(&fun2);
     send_errno_result(ei_send(fd, &pid, x.buff, x.index));
diff --git a/lib/erl_interface/test/ei_decode_SUITE.erl b/lib/erl_interface/test/ei_decode_SUITE.erl
index 75560ea7c9..e005ec89c7 100644
--- a/lib/erl_interface/test/ei_decode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_SUITE.erl
@@ -194,6 +194,9 @@ test_ei_decode_misc(Config) when is_list(Config) ->
     send_term_as_binary(P,<<>>),
     send_term_as_binary(P,<<"ÅÄÖåäö">>),
 
+    send_term_as_binary(P,<<1, 2, 3:5>>),
+    send_term_as_binary(P,<<1:1>>),
+
     %    send_term_as_binary(P,{}),
     %    send_term_as_binary(P,[]),
 
diff --git a/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c b/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c
index 66cdf2f502..d39970a857 100644
--- a/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c
+++ b/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c
@@ -317,6 +317,69 @@ static void decode_bin(int exp_size, const char* val, int exp_len)
     free_packet(buf);
 }
 
+static void decode_bits(int exp_size, const char* val, size_t exp_bits)
+{
+    char p[1024];
+    char *buf;
+    size_t bits;
+    int size1 = 0;
+    int size2 = 0;
+    int err;
+    message("ei_decode_bitstring should be %d bits", (int)exp_bits);
+    buf = read_packet(NULL);
+    err = ei_decode_bitstring(buf+1, &size1, NULL, sizeof(p), &bits);
+    message("err = %d, size = %d, len = %d, expected size = %d, expected bits = %d\n",\
+            err,size1, (int)bits, exp_size, (int)exp_bits);
+
+    if (err != 0) {
+        if (err != -1) {
+            fail("returned non zero but not -1 if NULL pointer");
+        } else {
+            fail("returned non zero");
+        }
+        return;
+    }
+
+    if (bits != exp_bits) {
+        fail("number of bits is not correct");
+        return;
+    }
+
+    err = ei_decode_bitstring(buf+1, &size2, p, sizeof(p), &bits);
+    message("err = %d, size = %d, len = %d, expected size = %d, expected len = %d\n",\
+            err,size2, (int)bits, exp_size, (int)exp_bits);
+    if (err != 0) {
+        if (err != -1) {
+            fail("returned non zero but not -1 if NULL pointer");
+        } else {
+            fail("returned non zero");
+        }
+        return;
+    }
+
+    if (bits != exp_bits) {
+        fail("bits is not correct");
+        return;
+    }
+
+    if (memcmp(p, val, (exp_bits+7)/8) != 0) {
+        fail("value is not correct");
+        return;
+    }
+
+    if (size1 != size2) {
+        fail("size with and without pointer differs");
+        return;
+    }
+
+    if (size1 != exp_size) {
+        fail2("size of encoded data is incorrect %d != %d", size1, exp_size);
+        return;
+    }
+    free_packet(buf);
+}
+
+
 /* ******************************************************************** */
 
 TESTCASE(test_ei_decode_long)
@@ -648,6 +711,14 @@ TESTCASE(test_ei_decode_misc)
     decode_bin(5, "", 0);
     decode_bin(11, "������", 6);
 
+#define LAST_BYTE(V, BITS) ((V) << (8-(BITS)))
+    {
+        unsigned char bits1[] = {1, 2, LAST_BYTE(3,5) };
+        unsigned char bits2[] = {LAST_BYTE(1,1) };
+        decode_bits(9, bits1, 21);
+        decode_bits(7, bits2, 1);
+    }
+
     /* FIXME check \0 in strings and atoms? */
 /*
     EI_ENCODE_1(decode_tuple_header, 0);
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE.erl b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
index 0f23cdfbb9..d8b0bce3ae 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
@@ -120,6 +120,8 @@ test_ei_decode_encode(Config) when is_list(Config) ->
     send_rec(P, #{key => value}),
     send_rec(P, maps:put(Port, Ref, #{key => value, key2 => Pid})),
 
+    [send_rec(P, <<16#dec0deb175:B/little>>) || B <- lists:seq(0,48)],
+
     runner:recv_eot(P),
     ok.
 
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
index 55d9ed1b1a..f9c05b2739 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
@@ -40,6 +40,12 @@ typedef struct
     erlang_char_encoding enc;
 }my_atom;
 
+typedef struct
+{
+    char bytes[MAXATOMLEN_UTF8];
+    size_t nbits;
+}my_bitstring;
+
 struct my_obj {
     union {
 	erlang_fun fun;
@@ -49,6 +55,7 @@ struct my_obj {
 	erlang_trace trace;
 	erlang_big big;
 	my_atom atom;
+        my_bitstring bits;
 
 	int arity;
     }u;
@@ -119,6 +126,26 @@ struct Type my_atom_type = {
     (encodeFT*)ei_encode_my_atom, (x_encodeFT*)ei_x_encode_my_atom
 };
 
+int ei_decode_my_bits(const char *buf, int *index, my_bitstring* a)
+{
+    return ei_decode_bitstring(buf, index, (a ? a->bytes : NULL),
+                               sizeof(a->bytes),
+                               (a ? &a->nbits : NULL));
+}
+int ei_encode_my_bits(char *buf, int *index, my_bitstring* a)
+{
+    return ei_encode_bitstring(buf, index, a->bytes, a->nbits);
+}
+int ei_x_encode_my_bits(ei_x_buff* x, my_bitstring* a)
+{
+    return ei_x_encode_bitstring(x, a->bytes, a->nbits);
+}
+
+struct Type my_bitstring_type = {
+    "bits", "my_bitstring", (decodeFT*)ei_decode_my_bits,
+    (encodeFT*)ei_encode_my_bits, (x_encodeFT*)ei_x_encode_my_bits
+};
+
 
 int my_decode_tuple_header(const char *buf, int *index, struct my_obj* obj)
 {
@@ -537,6 +564,10 @@ TESTCASE(test_ei_decode_encode)
 	decode_encode(map, 7);
     }
 
+    for (i=0; i <= 48; i++) {
+        decode_encode_one(&my_bitstring_type);
+    }
+
     report(1);
 }