File 1034-erts-After-a-call-to-a-tracer-nif-reset-ht... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1034-erts-After-a-call-to-a-tracer-nif-reset-htop.patch of Package erlang (Revision d4970e4b1284085ce4cdb3ac267e9b09)

Currently displaying revision d4970e4b1284085ce4cdb3ac267e9b09 , Show latest

From 3b186417f6641a3aa13a46e00712d7dfcb29fc0f Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Thu, 7 Jul 2016 15:50:03 +0200
Subject: [PATCH 2/2] erts: After a call to a tracer nif, reset htop

This is needed in order for the heap to never contain
any pointers to invalid memory. This is good for performance
and debugging reasons.
---
 erts/emulator/beam/erl_nif.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 23931f0..c6127a4 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -3502,6 +3502,7 @@ Eterm erts_nif_call_function(Process *p, Process *tracee,
         struct enif_environment_t env;
         ErlHeapFragment *orig_hf = MBUF(p);
         ErlOffHeap orig_oh = MSO(p);
+        Eterm *orig_htop = HEAP_TOP(p);
         ASSERT(is_internal_pid(p->common.id));
         MBUF(p) = NULL;
         clear_offheap(&MSO(p));
@@ -3523,6 +3524,7 @@ Eterm erts_nif_call_function(Process *p, Process *tracee,
         /* restore original heap fragment list */
         MBUF(p) = orig_hf;
         MSO(p) = orig_oh;
+        HEAP_TOP(p) = orig_htop;
     } else {
         /* Nif call was done without a process context,
            so we create a phony one. */
-- 
2.1.4

Places

File 1034-erts-After-a-call-to-a-tracer-nif-reset-htop.patch of Package erlang (Revision d4970e4b1284085ce4cdb3ac267e9b09)

Places