diff options
| author | Rickard Green <[email protected]> | 2011-04-06 09:53:04 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-04-11 17:29:38 +0200 |
| commit | 4458257e5c9c48d43fa0ea4fa981436f364e14e2 (patch) | |
| tree | 8e460023396d24b84b7f30a0107d79fadf27cd45 /erts/emulator/beam/beam_emu.c | |
| parent | b24144e3aec3d4fc0965c8621c5cd8ed63083d34 (diff) | |
| download | otp-4458257e5c9c48d43fa0ea4fa981436f364e14e2.tar.gz otp-4458257e5c9c48d43fa0ea4fa981436f364e14e2.tar.bz2 otp-4458257e5c9c48d43fa0ea4fa981436f364e14e2.zip | |
Only set status P_WAITING when needed
The status of a process was unnecessarily set to waiting before
the process was enqueued in a run queue. This bug was harmless
up until OTP-R14B01. In OTP-R14B02 erlang:hibernate/3 was fixed
(OTP-9125). After the introduction of OTP-9125, the previously
harmless process status bug sometimes caused erroneous badarg
exceptions from process_info().
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 7b2aac0908..df9d067727 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -6276,12 +6276,13 @@ erts_hibernate(Process* c_p, Eterm module, Eterm function, Eterm args, Eterm* re PROCESS_MAIN_CHK_LOCKS(c_p); erts_smp_proc_lock(c_p, ERTS_PROC_LOCK_MSGQ|ERTS_PROC_LOCK_STATUS); ASSERT(!ERTS_PROC_IS_EXITING(c_p)); - c_p->status = P_WAITING; #ifdef ERTS_SMP ERTS_SMP_MSGQ_MV_INQ2PRIVQ(c_p); if (c_p->msg.len > 0) erts_add_to_runq(c_p); + else #endif + c_p->status = P_WAITING; } erts_smp_proc_unlock(c_p, ERTS_PROC_LOCK_MSGQ|ERTS_PROC_LOCK_STATUS); c_p->current = bif_export[BIF_hibernate_3]->code; |