diff options
| author | Rickard Green <[email protected]> | 2016-08-31 14:07:37 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-31 14:07:37 +0200 |
| commit | bfe6427fa5ec615e73fc0aad2c5760370d786b19 (patch) | |
| tree | a4cddf4e3f8b07d3baef975b5533dedff730844a /erts | |
| parent | 90831a4abf26023811bc5762c915e22e0d3e5708 (diff) | |
| parent | c1e1c7b4caeda9637691c062d5c1337afe7aeeab (diff) | |
| download | otp-bfe6427fa5ec615e73fc0aad2c5760370d786b19.tar.gz otp-bfe6427fa5ec615e73fc0aad2c5760370d786b19.tar.bz2 otp-bfe6427fa5ec615e73fc0aad2c5760370d786b19.zip | |
Merge branch 'maint'
* maint:
Fix is-dirty-cpu/is-dirty-io scheduler predicates
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 94c13bb948..109d66012a 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1549,9 +1549,9 @@ extern int erts_system_profile_ts_type; #define ERTS_SCHEDULER_IS_DIRTY(ESDP) \ ((ESDP)->dirty_no.s.num != 0) #define ERTS_SCHEDULER_IS_DIRTY_CPU(ESDP) \ - ((ESDP)->dirty_no.s.type == 0) + (ERTS_SCHEDULER_IS_DIRTY((ESDP)) & ((ESDP)->dirty_no.s.type == 0)) #define ERTS_SCHEDULER_IS_DIRTY_IO(ESDP) \ - ((ESDP)->dirty_no.s.type == 1) + (ERTS_SCHEDULER_IS_DIRTY((ESDP)) & ((ESDP)->dirty_no.s.type == 1)) #else #define ERTS_SCHEDULER_IS_DIRTY(ESDP) 0 #define ERTS_SCHEDULER_IS_DIRTY_CPU(ESDP) 0 |