Merge pull request #1622 from pguyot/w15/system-info-additions

Add `erlang:system_info/1` additions for remote shell

These changes are made under both the "Apache 2.0" and the "GNU Lesser General
Public License 2.1 or later" license terms (dual license).

SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later

Author: bettio

src/libAtomVM/defaultatoms.def

@@ -181,3 +181,7 @@ X(TIMEOUT_ATOM, "\x7", "timeout")
 X(DIST_DATA_ATOM, "\x9", "dist_data")
 X(REQUEST_ATOM, "\x7", "request")
 X(CONNECT_ATOM, "\x7", "connect")
+
+X(SYSTEM_VERSION_ATOM, "\xE", "system_version")
+X(OTP_RELEASE_ATOM, "\xB", "otp_release")
+X(BREAK_IGNORED_ATOM, "\xD", "break_ignored")

src/libAtomVM/dist_nifs.h

@@ -34,6 +34,8 @@
 extern "C" {
 #endif
 
+#define DIST_OTP_RELEASE "27"
+
 extern const ErlNifResourceTypeInit dist_connection_resource_type_init;
 
 extern const struct Nif setnode_3_nif;

src/libAtomVM/nifs.c

@@ -2898,6 +2898,19 @@ static term nif_erlang_system_info(Context *ctx, int argc, term argv[])
     if (key == ATOMVM_VERSION_ATOM) {
         return term_from_literal_binary((const uint8_t *) ATOMVM_VERSION, strlen(ATOMVM_VERSION), &ctx->heap, ctx->global);
     }
+    if (key == SYSTEM_VERSION_ATOM) {
+        char system_version[256];
+        int len;
+#ifndef AVM_NO_SMP
+        len = snprintf(system_version, sizeof(system_version), "AtomVM %s [%d-bit] [smp:%d:%d]\n", ATOMVM_VERSION, TERM_BYTES * 8, ctx->global->online_schedulers, smp_get_online_processors());
+#else
+        len = snprintf(system_version, sizeof(system_version), "AtomVM %s [%d-bit] [nosmp]\n", ATOMVM_VERSION, TERM_BYTES * 8);
+#endif
+        if (UNLIKELY(memory_ensure_free_opt(ctx, len * CONS_SIZE, MEMORY_CAN_SHRINK) != MEMORY_GC_OK)) {
+            RAISE_ERROR(OUT_OF_MEMORY_ATOM);
+        }
+        return interop_bytes_to_list(system_version, len, &ctx->heap);
+    }
     if (key == REFC_BINARY_INFO_ATOM) {
         fprintf(stderr, "WARNING: The refc_binary_info system info tag is deprecated.  Use erlang:memory(binary) instead.\n");
         term ret = refc_binary_create_binary_info(ctx);
@@ -2906,6 +2919,16 @@ static term nif_erlang_system_info(Context *ctx, int argc, term argv[])
         }
         return ret;
     }
+    // For distribution, we report a gullible OTP version
+    if (key == OTP_RELEASE_ATOM) {
+        if (UNLIKELY(memory_ensure_free_opt(ctx, strlen(DIST_OTP_RELEASE) * CONS_SIZE, MEMORY_CAN_SHRINK) != MEMORY_GC_OK)) {
+            RAISE_ERROR(OUT_OF_MEMORY_ATOM);
+        }
+        return interop_bytes_to_list(DIST_OTP_RELEASE, strlen(DIST_OTP_RELEASE), &ctx->heap);
+    }
+    if (key == BREAK_IGNORED_ATOM) {
+        return TRUE_ATOM;
+    }
     if (key == SCHEDULERS_ATOM) {
 #ifndef AVM_NO_SMP
         return term_from_int32(smp_get_online_processors());

tests/erlang_tests/test_system_info.erl

@@ -35,19 +35,31 @@ start() ->
         _ ->
             assert(is_binary(erlang:system_info(system_architecture)))
     end,
+    SystemVersion = erlang:system_info(system_version),
+    true = is_list(SystemVersion),
+    case Machine of
+        "BEAM" ->
+            "Erlang/OTP " ++ _ = SystemVersion;
+        _ ->
+            "AtomVM " ++ _ = SystemVersion
+    end,
+    OTPRelease = erlang:system_info(otp_release),
+    true = is_list(OTPRelease),
+    OTPReleaseInt = list_to_integer(OTPRelease),
+    true = OTPReleaseInt > 20,
     case Machine of
         "BEAM" ->
             % beam raises badarg, and probably so should AtomVM.
             ok =
                 try
-                    erlang:system_info(some_wierd_unused_key),
+                    erlang:system_info(some_weird_unused_key),
                     unexpected
                 catch
                     error:badarg ->
                         ok
                 end;
         _ ->
-            assert(erlang:system_info(some_wierd_unused_key) =:= undefined)
+            assert(erlang:system_info(some_weird_unused_key) =:= undefined)
     end,
     0.