File 0179-Avoid-to-unnecessarily-pass-recv-markers-i... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0179-Avoid-to-unnecessarily-pass-recv-markers-in-matching.patch of Package erlang (Revision e580c2dc40e2c054a5be6bebabbc6148)

Currently displaying revision e580c2dc40e2c054a5be6bebabbc6148 , Show latest

From 1d7af1772dd4080dc0757603a6cee42d63a69b65 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Fri, 1 Oct 2021 18:39:18 +0200
Subject: [PATCH] Avoid to unnecessarily pass recv markers in matching receive

Avoid to unnecessarily pass recv markers following a matching message
in a receive since we are anyway going to set the save pointer to the
beginning of the message queue.
---
 erts/emulator/beam/emu/msg_instrs.tab    |  3 +--
 erts/emulator/beam/erl_proc_sig_queue.h  | 31 ++++++++++++++++++++++++
 erts/emulator/beam/jit/beam_jit_common.c |  3 +--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/erts/emulator/beam/emu/msg_instrs.tab b/erts/emulator/beam/emu/msg_instrs.tab
index 085cdb34cd..15002fa807 100644
--- a/erts/emulator/beam/emu/msg_instrs.tab
+++ b/erts/emulator/beam/emu/msg_instrs.tab
@@ -271,8 +271,7 @@ remove_message() {
                 tok_label, tok_lastcnt, tok_serial);
     }
 #endif
-    erts_msgq_unlink_msg(c_p, msgp);
-    erts_msgq_set_save_first(c_p);
+    erts_msgq_unlink_msg_set_save_first(c_p, msgp);
     CANCEL_TIMER(c_p);
 
     erts_save_message_in_proc(c_p, msgp);
diff --git a/erts/emulator/beam/erl_proc_sig_queue.h b/erts/emulator/beam/erl_proc_sig_queue.h
index 236b20ab4d..90a87570c2 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.h
+++ b/erts/emulator/beam/erl_proc_sig_queue.h
@@ -1455,6 +1455,22 @@ ERTS_GLB_INLINE void erts_msgq_unlink_msg(Process *c_p,
  */
 ERTS_GLB_INLINE void erts_msgq_set_save_first(Process *c_p);
 
+/**
+ *
+ * @brief Remove a message from the message queue and set
+ *        the save pointer to the start of the message queue.
+ *
+ *
+ * @param[in]     c_p           Pointer to process struct of
+ *                              currently executing process.
+ *
+ * @param[in]     msgp          A pointer to the message to
+ *                              remove from the message queue.
+ *
+ */
+ERTS_GLB_INLINE void erts_msgq_unlink_msg_set_save_first(Process *c_p,
+                                                         ErtsMessage *msgp);
+
 /**
  *
  * @brief Advance the save pointer to the next message in the
@@ -1864,6 +1880,21 @@ erts_msgq_set_save_first(Process *c_p)
     c_p->sig_qs.save = &c_p->sig_qs.first;
 }
 
+ERTS_GLB_INLINE void
+erts_msgq_unlink_msg_set_save_first(Process *c_p, ErtsMessage *msgp)
+{
+    ErtsMessage *sigp = msgp->next;
+    ERTS_HDBG_CHECK_SIGNAL_PRIV_QUEUE__(c_p, 0, "before");
+    *c_p->sig_qs.save = sigp;
+    c_p->sig_qs.len--;
+    if (!sigp)
+        c_p->sig_qs.last = c_p->sig_qs.save;
+    else if (ERTS_SIG_IS_RECV_MARKER(sigp))
+        ((ErtsRecvMarker *) sigp)->prev_next = c_p->sig_qs.save;
+    erts_msgq_set_save_first(c_p);
+    ERTS_HDBG_CHECK_SIGNAL_PRIV_QUEUE__(c_p, 0, "after");
+}
+
 ERTS_GLB_INLINE void
 erts_msgq_set_save_next(Process *c_p)
 {
diff --git a/erts/emulator/beam/jit/beam_jit_common.c b/erts/emulator/beam/jit/beam_jit_common.c
index a69a48beff..d2d4ad43d6 100644
--- a/erts/emulator/beam/jit/beam_jit_common.c
+++ b/erts/emulator/beam/jit/beam_jit_common.c
@@ -664,8 +664,7 @@ Sint beam_jit_remove_message(Process *c_p,
                 tok_serial);
     }
 #endif
-    erts_msgq_unlink_msg(c_p, msgp);
-    erts_msgq_set_save_first(c_p);
+    erts_msgq_unlink_msg_set_save_first(c_p, msgp);
     CANCEL_TIMER(c_p);
 
     erts_save_message_in_proc(c_p, msgp);
-- 
2.31.1

Places

File 0179-Avoid-to-unnecessarily-pass-recv-markers-in-matching.patch of Package erlang (Revision e580c2dc40e2c054a5be6bebabbc6148)

Places