Merge branch 'rickard/rm-mqd-mixed/OTP-13366'

* rickard/rm-mqd-mixed/OTP-13366:
  Remove the 'message_queue_data' option 'mixed'

6 files changed, 11 insertions, 41 deletions

diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index 7fdce62bd1..badd69856e 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -390,7 +390,6 @@ atom min_heap_size
 atom min_bin_vheap_size
 atom minor_version
 atom Minus='-'
-atom mixed
 atom module
 atom module_info
 atom monitored_by
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 2a3bd4afe5..e77da526fd 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -917,9 +917,6 @@ BIF_RETTYPE spawn_opt_1(BIF_ALIST_1)
 		    goto error;
 	    } else if (arg == am_message_queue_data) {
 		switch (val) {
-		case am_mixed:
-		    so.flags &= ~(SPO_OFF_HEAP_MSGQ|SPO_ON_HEAP_MSGQ);
-		    break;
 		case am_on_heap:
 		    so.flags &= ~SPO_OFF_HEAP_MSGQ;
 		    so.flags |= SPO_ON_HEAP_MSGQ;
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 2e195db0ee..b410578d37 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -1565,9 +1565,6 @@ process_info_aux(Process *BIF_P,
 	case F_ON_HEAP_MSGQ:
 	    res = am_on_heap;
 	    break;
-	case 0:
-	    res = am_mixed;
-	    break;
 	default:
 	    res = am_error;
 	    ERTS_INTERNAL_ERROR("Inconsistent message queue management state");
@@ -2809,8 +2806,6 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	    BIF_RET(am_off_heap);
 	case SPO_ON_HEAP_MSGQ:
 	    BIF_RET(am_on_heap);
-	case 0:
-	    BIF_RET(am_mixed);
 	default:
 	    ERTS_INTERNAL_ERROR("Inconsistent message queue management state");
 	    BIF_RET(am_error);
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 0649fb68de..fbdafec4ef 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -585,7 +585,7 @@ void erts_usage(void)
     erts_fprintf(stderr, "-hpds size     initial process dictionary size (default %d)\n",
 	       erts_pd_initial_size);
     erts_fprintf(stderr, "-hmqd  val     set default message queue data flag for processes,\n");
-    erts_fprintf(stderr, "               valid values are: off_heap | on_heap | mixed\n");
+    erts_fprintf(stderr, "               valid values are: off_heap | on_heap\n");
 
     /*    erts_fprintf(stderr, "-i module  set the boot module (default init)\n"); */
 
@@ -1526,9 +1526,7 @@ erl_start(int argc, char **argv)
 			    erts_pd_initial_size));
             } else if (has_prefix("mqd", sub_param)) {
 		arg = get_arg(sub_param+3, argv[i+1], &i);
-		if (sys_strcmp(arg, "mixed") == 0)
-		    erts_default_spo_flags &= ~(SPO_ON_HEAP_MSGQ|SPO_OFF_HEAP_MSGQ);
-		else if (sys_strcmp(arg, "on_heap") == 0) {
+		if (sys_strcmp(arg, "on_heap") == 0) {
 		    erts_default_spo_flags &= ~SPO_OFF_HEAP_MSGQ;
 		    erts_default_spo_flags |= SPO_ON_HEAP_MSGQ;
 		}
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index 579f6e427d..d82532b354 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -1123,11 +1123,9 @@ erts_change_message_queue_management(Process *c_p, Eterm new_state)
 	    break;
 	case am_on_heap:
 	    c_p->flags |= F_ON_HEAP_MSGQ;
+	    c_p->flags &= ~F_OFF_HEAP_MSGQ;
 	    erts_smp_atomic32_read_bor_nob(&c_p->state,
 					   ERTS_PSFLG_ON_HEAP_MSGQ);
-	    /* fall through */
-	case am_mixed:
-	    c_p->flags &= ~F_OFF_HEAP_MSGQ;
 	    /*
 	     * We are not allowed to clear ERTS_PSFLG_OFF_HEAP_MSGQ
 	     * if a off heap change is ongoing. It will be adjusted
@@ -1151,11 +1149,6 @@ erts_change_message_queue_management(Process *c_p, Eterm new_state)
 	switch (new_state) {
 	case am_on_heap:
 	    break;
-	case am_mixed:
-	    c_p->flags &= ~F_ON_HEAP_MSGQ;
-	    erts_smp_atomic32_read_band_nob(&c_p->state,
-					    ~ERTS_PSFLG_ON_HEAP_MSGQ);
-	    break;
 	case am_off_heap:
 	    c_p->flags &= ~F_ON_HEAP_MSGQ;
 	    erts_smp_atomic32_read_band_nob(&c_p->state,
@@ -1167,25 +1160,6 @@ erts_change_message_queue_management(Process *c_p, Eterm new_state)
 	}
 	break;
 
-    case 0:
-	res = am_mixed;
-
-	switch (new_state) {
-	case am_mixed:
-	    break;
-	case am_on_heap:
-	    c_p->flags |= F_ON_HEAP_MSGQ;
-	    erts_smp_atomic32_read_bor_nob(&c_p->state,
-					   ERTS_PSFLG_ON_HEAP_MSGQ);
-	    break;
-	case am_off_heap:
-	    goto change_to_off_heap;
-	default:
-	    res = THE_NON_VALUE; /* badarg */
-	    break;
-	}
-	break;
-
     default:
 	res = am_error;
 	ERTS_INTERNAL_ERROR("Inconsistent message queue management state");
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index a853ec585b..f8cbe60e76 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -149,7 +149,7 @@ extern BeamInstr beam_apply[];
 extern BeamInstr beam_exit[];
 extern BeamInstr beam_continue_exit[];
 
-int ERTS_WRITE_UNLIKELY(erts_default_spo_flags) = 0;
+int ERTS_WRITE_UNLIKELY(erts_default_spo_flags) = SPO_ON_HEAP_MSGQ;
 int ERTS_WRITE_UNLIKELY(erts_eager_check_io) = 1;
 int ERTS_WRITE_UNLIKELY(erts_sched_compact_load);
 int ERTS_WRITE_UNLIKELY(erts_sched_balance_util) = 0;
@@ -11206,6 +11206,8 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 	flags |= F_ON_HEAP_MSGQ;
     }
 
+    ASSERT((flags & F_ON_HEAP_MSGQ) || (flags & F_OFF_HEAP_MSGQ));
+
     if (!rq)
 	rq = erts_get_runq_proc(parent);
 
@@ -11218,6 +11220,11 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 	goto error;
     }
 
+    ASSERT((erts_smp_atomic32_read_nob(&p->state)
+	    & ERTS_PSFLG_ON_HEAP_MSGQ)
+	   || (erts_smp_atomic32_read_nob(&p->state)
+	       & ERTS_PSFLG_OFF_HEAP_MSGQ));
+
 #ifdef BM_COUNTERS
     processes_busy++;
 #endif