diff options
| author | Lukas Larsson <[email protected]> | 2014-12-19 10:53:27 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-12-19 10:53:27 +0100 |
| commit | 3e3ef7b16fa03a7b9f4e5376387750a69957719f (patch) | |
| tree | 40d74a3d6ccd8a4faa5c7194979584fa67517ea1 /erts/emulator/beam/erl_thr_progress.h | |
| parent | a4d72d2cae3a9bd3f0dccdb663f70d54a45fe10f (diff) | |
| parent | bd4b900c09308a6c3ab41e3a2070cb90410ee01d (diff) | |
| download | otp-3e3ef7b16fa03a7b9f4e5376387750a69957719f.tar.gz otp-3e3ef7b16fa03a7b9f4e5376387750a69957719f.tar.bz2 otp-3e3ef7b16fa03a7b9f4e5376387750a69957719f.zip | |
Merge branch 'lukas/erts/crashdump_improvements/OTP-12377'
* lukas/erts/crashdump_improvements/OTP-12377:
erts: Make main thread safe from pipe closed event
erts: Improve crash dumps
erts: Rename sys_sigset to sys_signal
erts: Introduce thread suspend functions
erts: Remove usage of QUANTIFY signal
erts: Add support for thread names
ets: Increase data available in crash dumps and ets:info
erts: Start compilation of beam_emu earlier
Diffstat (limited to 'erts/emulator/beam/erl_thr_progress.h')
| -rw-r--r-- | erts/emulator/beam/erl_thr_progress.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_thr_progress.h b/erts/emulator/beam/erl_thr_progress.h index 03ddbd467c..cf11c4e114 100644 --- a/erts/emulator/beam/erl_thr_progress.h +++ b/erts/emulator/beam/erl_thr_progress.h @@ -83,8 +83,8 @@ typedef struct { ErtsThrPrgrLeaderState leader_state; } ErtsThrPrgrData; -void erts_thr_progress_fatal_error_block(SWord timeout, - ErtsThrPrgrData *tmp_tpd_bufp); +int erts_thr_progress_fatal_error_block(ErtsThrPrgrData *tmp_tpd_bufp); +void erts_thr_progress_fatal_error_wait(SWord timeout); #endif /* ERTS_SMP */ |