diff options
| author | Lukas Larsson <[email protected]> | 2017-07-18 14:30:55 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-07-18 14:30:55 +0200 |
| commit | aa8df5238a20a539bc90deb68aa39050197ba725 (patch) | |
| tree | bf5108a9a9304b8377b9e5a922274daef6f0ba20 /erts/emulator/sys/win32/sys_interrupt.c | |
| parent | de5cfabdad61d45a112d95e24ac44e3f51a4bd18 (diff) | |
| parent | 7b5a1a7e787570ff13805a150e4c7c13bda8b0a6 (diff) | |
| download | otp-aa8df5238a20a539bc90deb68aa39050197ba725.tar.gz otp-aa8df5238a20a539bc90deb68aa39050197ba725.tar.bz2 otp-aa8df5238a20a539bc90deb68aa39050197ba725.zip | |
lukas/erts/remove-non-smp/OTP-14518
Remove support for the non-smp emulators
Diffstat (limited to 'erts/emulator/sys/win32/sys_interrupt.c')
| -rw-r--r-- | erts/emulator/sys/win32/sys_interrupt.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/erts/emulator/sys/win32/sys_interrupt.c b/erts/emulator/sys/win32/sys_interrupt.c index df838960eb..02aa50500f 100644 --- a/erts/emulator/sys/win32/sys_interrupt.c +++ b/erts/emulator/sys/win32/sys_interrupt.c @@ -35,17 +35,11 @@ # define WIN_SYS_INLINE __forceinline #endif -#ifdef ERTS_SMP -erts_smp_atomic32_t erts_break_requested; +erts_atomic32_t erts_break_requested; #define ERTS_SET_BREAK_REQUESTED \ - erts_smp_atomic32_set_nob(&erts_break_requested, (erts_aint32_t) 1) + erts_atomic32_set_nob(&erts_break_requested, (erts_aint32_t) 1) #define ERTS_UNSET_BREAK_REQUESTED \ - erts_smp_atomic32_set_nob(&erts_break_requested, (erts_aint32_t) 0) -#else -volatile int erts_break_requested = 0; -#define ERTS_SET_BREAK_REQUESTED (erts_break_requested = 1) -#define ERTS_UNSET_BREAK_REQUESTED (erts_break_requested = 0) -#endif + erts_atomic32_set_nob(&erts_break_requested, (erts_aint32_t) 0) extern int nohup; HANDLE erts_sys_break_event = NULL; @@ -57,14 +51,14 @@ void erts_do_break_handling(void) * therefore, make sure that all threads but this one are blocked before * proceeding! */ - erts_smp_thr_progress_block(); + erts_thr_progress_block(); /* call the break handling function, reset the flag */ do_break(); ResetEvent(erts_sys_break_event); ERTS_UNSET_BREAK_REQUESTED; - erts_smp_thr_progress_unblock(); + erts_thr_progress_unblock(); } |