diff options
| author | Rickard Green <[email protected]> | 2011-02-25 10:44:35 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-02-25 10:44:35 +0100 |
| commit | 499b3cffeceb3795f51b1046ad629a49d3ccdc65 (patch) | |
| tree | fe4ad0d2dd51953494c3c8cb123c66de26a54165 /erts/emulator/beam | |
| parent | ea7abb8683b62f43cd868aefe81935f4de686722 (diff) | |
| parent | 9cc0332d42f58b69fbd10123e56c9e246ec4023b (diff) | |
| download | otp-499b3cffeceb3795f51b1046ad629a49d3ccdc65.tar.gz otp-499b3cffeceb3795f51b1046ad629a49d3ccdc65.tar.bz2 otp-499b3cffeceb3795f51b1046ad629a49d3ccdc65.zip | |
Merge branch 'rickard/poll-wake/OTP-9019' into dev
* rickard/poll-wake/OTP-9019:
Simplify erts_poll_wait() wakeup logic
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_threads.h | 5 | ||||
| -rw-r--r-- | erts/emulator/beam/sys.h | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_threads.h b/erts/emulator/beam/erl_threads.h index 84a20b51f2..bd1d35aa05 100644 --- a/erts/emulator/beam/erl_threads.h +++ b/erts/emulator/beam/erl_threads.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2001-2010. All Rights Reserved. + * Copyright Ericsson AB 2001-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -175,6 +175,9 @@ typedef struct { int gcc_is_buggy; } erts_rwlock_t; #endif /* #ifdef USE_THREADS */ #define ERTS_AINT_T_MAX (~(((erts_aint_t) 1) << (sizeof(erts_aint_t)*8-1))) +#define ERTS_AINT_T_MIN ((((erts_aint_t) 1) << (sizeof(erts_aint_t)*8-1))) +#define ERTS_AINT32_T_MAX (~(((erts_aint32_t) 1) << (sizeof(erts_aint32_t)*8-1))) +#define ERTS_AINT32_T_MIN ((((erts_aint32_t) 1) << (sizeof(erts_aint32_t)*8-1))) ERTS_GLB_INLINE void erts_thr_init(erts_thr_init_data_t *id); ERTS_GLB_INLINE void erts_thr_late_init(erts_thr_late_init_data_t *id); diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index b1cd683b3b..4ed11cf418 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -335,8 +335,8 @@ typedef unsigned char byte; #ifdef ERTS_WANT_BREAK_HANDLING # ifdef ERTS_SMP -extern erts_smp_atomic_t erts_break_requested; -# define ERTS_BREAK_REQUESTED ((int) erts_smp_atomic_read(&erts_break_requested)) +extern erts_smp_atomic32_t erts_break_requested; +# define ERTS_BREAK_REQUESTED ((int) erts_smp_atomic32_read(&erts_break_requested)) # else extern volatile int erts_break_requested; # define ERTS_BREAK_REQUESTED erts_break_requested @@ -349,8 +349,8 @@ void erts_do_break_handling(void); # define ERTS_GOT_SIGUSR1 0 # else # ifdef ERTS_SMP -extern erts_smp_atomic_t erts_got_sigusr1; -# define ERTS_GOT_SIGUSR1 ((int) erts_smp_atomic_read(&erts_got_sigusr1)) +extern erts_smp_atomic32_t erts_got_sigusr1; +# define ERTS_GOT_SIGUSR1 ((int) erts_smp_atomic32_read(&erts_got_sigusr1)) # else extern volatile int erts_got_sigusr1; # define ERTS_GOT_SIGUSR1 erts_got_sigusr1 |