Merge branch 'maint'

* maint:
  [erts] Ensure that prio msgq markers are only installed when needed

Author: rickard-green

erts/emulator/beam/bif.c

@@ -395,6 +395,8 @@ static BIF_RETTYPE link_opt(Process *c_p, Eterm other, Eterm opts)
 
     ERTS_BIF_PREP_ERROR(ret_val, c_p, BADARG);
 
+    return ret_val;
+
 done:
 
     if (prio_change) {
@@ -484,11 +486,14 @@ demonitor(Process *c_p, Eterm ref, Eterm *multip)
    case ERTS_ML_STATE_ALIAS_DEMONITOR:
    default:
        erts_monitor_tree_delete(&ERTS_P_MONITORS(c_p), mon);
-       if (mon->flags & ERTS_ML_FLG_PRIO_ML)
-           erts_proc_sig_prio_item_deleted(c_p, ERTS_PRIO_ITEM_TYPE_MONITOR);
+       if (mon->flags & ERTS_ML_FLG_PRIO_ALIAS)
+           erts_proc_sig_prio_item_deleted(c_p, ERTS_PRIO_ITEM_TYPE_ALIAS);
        break;
    }
 
+   if (mon->flags & ERTS_ML_FLG_PRIO_ML)
+       erts_proc_sig_prio_item_deleted(c_p, ERTS_PRIO_ITEM_TYPE_MONITOR);
+
    switch (ERTS_ML_GET_TYPE(mon)) {
 
    case ERTS_MON_TYPE_TIME_OFFSET:
@@ -773,7 +778,11 @@ static BIF_RETTYPE monitor(Process *c_p, Eterm type, Eterm target,
 
         local_process:
 
-            if (id != c_p->common.id) {
+            if (id == c_p->common.id) {
+                /* No monitoring of self... */
+                add_oflags = 0;
+            }
+            else {
                 mdp = erts_monitor_create(ERTS_MON_TYPE_PROC,
                                           ref, c_p->common.id,
                                           id, name, tag);
@@ -960,6 +969,7 @@ static BIF_RETTYPE monitor(Process *c_p, Eterm type, Eterm target,
 
 badarg:
 
+    add_oflags = 0;
     ERTS_BIF_PREP_ERROR(ret_val, c_p, BADARG);
 
 done:

erts/emulator/beam/erl_proc_sig_queue.c

@@ -6052,8 +6052,18 @@ handle_altact_msg(Process *c_p, ErtsSigRecvTracing *tracing,
             mon->flags &= ~ERTS_ML_STATE_ALIAS_MASK;
 
             erts_monitor_tree_delete(&ERTS_P_MONITORS(c_p), mon);
-            if (flags & ERTS_ML_FLG_PRIO_ALIAS)
+            if (flags & ERTS_ML_FLG_PRIO_ALIAS) {
+                mon->flags &= ~ERTS_ML_FLG_PRIO_ALIAS;
+                /*
+                 * See comment at end of function why we don't delete alias
+                 * reference now...
+                 */
                 prio_alias_deactivated = !0;
+            }
+            if (flags & ERTS_ML_FLG_PRIO_ML) {
+                mon->flags &= ~ERTS_ML_FLG_PRIO_ML;
+                erts_proc_sig_prio_item_deleted(c_p, ERTS_PRIO_ITEM_TYPE_MONITOR);
+            }
 
             switch (ERTS_ML_GET_TYPE(mon)) {
             case ERTS_MON_TYPE_DIST_PORT:
@@ -6675,6 +6685,11 @@ erts_proc_sig_handle_incoming(Process *c_p, erts_aint32_t *statep,
                     ErtsELink *elnk;
                     ErtsLink *dlnk = erts_link_to_other(llnk, &elnk);
                     if (!elnk->unlinking) {
+                        if (llnk->flags & ERTS_ML_FLG_PRIO_ML) {
+                            llnk->flags &= ~ERTS_ML_FLG_PRIO_ML;
+                            erts_proc_sig_prio_item_deleted(
+                                c_p, ERTS_PRIO_ITEM_TYPE_LINK);
+                        }
                         erts_link_tree_delete(&ERTS_P_LINKS(c_p), llnk);
                         if (erts_link_dist_delete(dlnk))
                             erts_link_release_both(&elnk->ld);
@@ -6693,6 +6708,11 @@ erts_proc_sig_handle_incoming(Process *c_p, erts_aint32_t *statep,
                 llnk = erts_link_tree_lookup(ERTS_P_LINKS(c_p),
                                              sulnk->from);
                 if (llnk && !((ErtsILink *) llnk)->unlinking) {
+                    if (llnk->flags & ERTS_ML_FLG_PRIO_ML) {
+                        llnk->flags &= ~ERTS_ML_FLG_PRIO_ML;
+                        erts_proc_sig_prio_item_deleted(
+                            c_p, ERTS_PRIO_ITEM_TYPE_LINK);
+                    }
                     if (tracing.procs)
                         getting_unlinked(c_p, sulnk->from);
                     erts_link_tree_delete(&ERTS_P_LINKS(c_p), llnk);