File 1203-erts-Add-debug-toggling-for-JDdump-at-runt... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1203-erts-Add-debug-toggling-for-JDdump-at-runtime.patch of Package erlang (Revision 1c6d27e874ff4bb28c5c2e74b90a1fc8)

Currently displaying revision 1c6d27e874ff4bb28c5c2e74b90a1fc8 , Show latest

From 99fd737eed235bb7a5dae670d1bb373b60d64157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Tue, 12 Oct 2021 17:24:29 +0200
Subject: [PATCH 3/9] erts: Add debug toggling for +JDdump at runtime

---
 erts/emulator/beam/erl_bif_info.c             | 20 +++++++++++++++++++
 .../emulator/beam/jit/arm/beam_asm_module.cpp |  4 ++--
 .../emulator/beam/jit/x86/beam_asm_module.cpp |  4 ++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index e4d0d870d0..929f06e1ef 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -4903,6 +4903,26 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
                                           (void *) BIF_P);
                 BIF_RET(am_ok);
             }
+        } else if (ERTS_IS_ATOM_STR("jit_asm_dump", BIF_ARG_1)) {
+#ifdef BEAMASM
+            /* Undocumented debug option for the JIT, changing the +JDdump
+             * setting at runtime. This saves us from dumping half of OTP every
+             * time we want to debug the loading of a single module. */
+            Eterm res = erts_jit_asm_dump ? am_true : am_false;
+            switch (BIF_ARG_2)
+            {
+            case am_false:
+                erts_jit_asm_dump = 0;
+                BIF_RET(res);
+            case am_true:
+                erts_jit_asm_dump = 1;
+                BIF_RET(res);
+            default:
+                break;
+            }
+#else
+            BIF_RET(am_notsup);
+#endif
         }
     }
 
diff --git a/erts/emulator/beam/jit/arm/beam_asm_module.cpp b/erts/emulator/beam/jit/arm/beam_asm_module.cpp
index d4cb0172f2..628827eaa3 100644
--- a/erts/emulator/beam/jit/arm/beam_asm_module.cpp
+++ b/erts/emulator/beam/jit/arm/beam_asm_module.cpp
@@ -86,7 +86,7 @@ BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *_ga,
     _veneers.reserve(num_labels + 1);
     rawLabels.reserve(num_labels + 1);
 
-    if (erts_jit_asm_dump && named_labels) {
+    if (logger.file() && named_labels) {
         BeamFile_ExportEntry *e = &named_labels->entries[0];
         for (unsigned int i = 1; i < num_labels; i++) {
             /* Large enough to hold most realistic function names. We will
@@ -107,7 +107,7 @@ BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *_ga,
                 rawLabels[i] = a.newNamedLabel(lblName.data());
             }
         }
-    } else if (erts_jit_asm_dump) {
+    } else if (logger.file()) {
         /* There is no naming info, but dumping of the assembly code
          * has been requested, so do the best we can and number the
          * labels. */
diff --git a/erts/emulator/beam/jit/x86/beam_asm_module.cpp b/erts/emulator/beam/jit/x86/beam_asm_module.cpp
index ab0009441c..5edab64b0c 100644
--- a/erts/emulator/beam/jit/x86/beam_asm_module.cpp
+++ b/erts/emulator/beam/jit/x86/beam_asm_module.cpp
@@ -84,7 +84,7 @@ BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *_ga,
         : BeamAssembler(getAtom(_mod)), ga(_ga), mod(_mod) {
     labels.reserve(num_labels + 1);
 
-    if (erts_jit_asm_dump && named_labels) {
+    if (logger.file() && named_labels) {
         BeamFile_ExportEntry *e = &named_labels->entries[0];
         for (unsigned int i = 1; i < num_labels; i++) {
             /* Large enough to hold most realistic function names. We will
@@ -105,7 +105,7 @@ BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *_ga,
                 labels[i] = a.newNamedLabel(lblName.data());
             }
         }
-    } else if (erts_jit_asm_dump) {
+    } else if (logger.file()) {
         /* There is no naming info, but dumping of the assembly code
          * has been requested, so do the best we can and number the
          * labels. */
-- 
2.31.1

Places

File 1203-erts-Add-debug-toggling-for-JDdump-at-runtime.patch of Package erlang (Revision 1c6d27e874ff4bb28c5c2e74b90a1fc8)

Places