diff options
| author | Rickard Green <[email protected]> | 2016-05-25 16:15:36 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-05-25 16:15:53 +0200 |
| commit | 36f98375d57daaba3fec42bb91482cdac9ef4cc9 (patch) | |
| tree | 66cd0a295ac70b6b94ec84bb11d8b9f1165e039a /erts/emulator/beam/erl_process.c | |
| parent | c126081ca43145412f72a1b5cbae6919c22de28e (diff) | |
| download | otp-36f98375d57daaba3fec42bb91482cdac9ef4cc9.tar.gz otp-36f98375d57daaba3fec42bb91482cdac9ef4cc9.tar.bz2 otp-36f98375d57daaba3fec42bb91482cdac9ef4cc9.zip | |
Remove the 'message_queue_data' option 'mixed'
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 9 |
1 files changed, 8 insertions, 1 deletions
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 |