aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-08-31 14:06:57 +0200
committerRickard Green <[email protected]>2016-08-31 14:06:57 +0200
commitc1e1c7b4caeda9637691c062d5c1337afe7aeeab (patch)
treec395b8357370e698440e029bcd4b5876fb5b9f32
parentee8f2380837321fef4975522bfa53cb9161874ac (diff)
parentcb8d2f366415fd46aeb87320f4fdf19adc9f0eb0 (diff)
downloadotp-c1e1c7b4caeda9637691c062d5c1337afe7aeeab.tar.gz
otp-c1e1c7b4caeda9637691c062d5c1337afe7aeeab.tar.bz2
otp-c1e1c7b4caeda9637691c062d5c1337afe7aeeab.zip
Merge branch 'rickard/ds-pred/OTP-13852' into maint
* rickard/ds-pred/OTP-13852: Fix is-dirty-cpu/is-dirty-io scheduler predicates
-rw-r--r--erts/emulator/beam/erl_process.h4
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