diff options
| author | Zandra Hird <[email protected]> | 2015-07-07 15:20:40 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-07-07 15:20:40 +0200 |
| commit | 9ebb4472d9cbe0dc907c894231ce1f61a04fa0b6 (patch) | |
| tree | 21b4f9898de2e67f515c6cf16a207f7b592dbe05 /erts/emulator/beam/erl_process.c | |
| parent | 5b9d3387bac102ee3a8114e2b3316abd86d2e1fb (diff) | |
| parent | 832aa9e06aced4975c9cb02257f74827602217aa (diff) | |
| download | otp-9ebb4472d9cbe0dc907c894231ce1f61a04fa0b6.tar.gz otp-9ebb4472d9cbe0dc907c894231ce1f61a04fa0b6.tar.bz2 otp-9ebb4472d9cbe0dc907c894231ce1f61a04fa0b6.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 338be6d8e1..11485c57df 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -11389,6 +11389,22 @@ set_proc_exiting(Process *p, KILL_CATCHES(p); p->i = (BeamInstr *) beam_exit; +#ifndef ERTS_SMP + if (state & (ERTS_PSFLG_RUNNING|ERTS_PSFLG_RUNNING_SYS)) { + /* + * I non smp case: + * + * Currently executing process might be sent an exit + * signal if it is traced by a port that it also is + * linked to, and the port terminates during the + * trace. In this case we want schedule out the + * process as quickly as possible in order to detect + * the event as fast as possible. + */ + ERTS_VBUMP_ALL_REDS(p); + } +#endif + if (enqueue) add2runq(enqueue > 0 ? p : make_proxy_proc(NULL, p, enq_prio), state, |