diff options
| author | Rickard Green <[email protected]> | 2016-02-15 10:01:00 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-02-15 10:01:00 +0100 |
| commit | 28c9fe4028281029f5028758fbd0a0fc02a78d4d (patch) | |
| tree | 3c7502ac1eac57a305344fe3b9086b331353bb01 /erts/emulator/beam/erl_process_dump.c | |
| parent | cf99bf2de73be06e0f0d597dc72e3d7df1ed5f90 (diff) | |
| parent | 5d8a987285cf13e8d87731a6284c7df7ed3dac70 (diff) | |
| download | otp-28c9fe4028281029f5028758fbd0a0fc02a78d4d.tar.gz otp-28c9fe4028281029f5028758fbd0a0fc02a78d4d.tar.bz2 otp-28c9fe4028281029f5028758fbd0a0fc02a78d4d.zip | |
Merge branch 'rickard/ds-fixes' into rickard/ds-fixes-master
* rickard/ds-fixes:
Fix unique_SUITE for dirty schedulers
Add dirty scheduler process termination test
Ensure that work is done on the correct type of schedulers
Conflicts:
erts/emulator/beam/erl_process.c
erts/emulator/beam/erl_process.h
erts/emulator/beam/erl_process_dump.c
Diffstat (limited to 'erts/emulator/beam/erl_process_dump.c')
| -rw-r--r-- | erts/emulator/beam/erl_process_dump.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c index 71396561a3..39c36ee7a9 100644 --- a/erts/emulator/beam/erl_process_dump.c +++ b/erts/emulator/beam/erl_process_dump.c @@ -618,7 +618,7 @@ erts_dump_extended_process_state(int to, void *to_arg, erts_aint32_t psflg) { if (psflg) erts_print(to, to_arg, " | "); - for (i = 0; i < ERTS_PSFLG_MAX && psflg; i++) { + for (i = 0; i <= ERTS_PSFLG_MAX && psflg; i++) { erts_aint32_t chk = (1 << i); if (psflg & chk) { switch (chk) { @@ -660,16 +660,14 @@ erts_dump_extended_process_state(int to, void *to_arg, erts_aint32_t psflg) { erts_print(to, to_arg, "DELAYED_SYS"); break; case ERTS_PSFLG_OFF_HEAP_MSGQ: erts_print(to, to_arg, "OFF_HEAP_MSGQ"); break; -#ifdef ERTS_DIRTY_SCHEDULERS + case ERTS_PSFLG_ON_HEAP_MSGQ: + erts_print(to, to_arg, "ON_HEAP_MSGQ"); break; case ERTS_PSFLG_DIRTY_CPU_PROC: erts_print(to, to_arg, "DIRTY_CPU_PROC"); break; case ERTS_PSFLG_DIRTY_IO_PROC: erts_print(to, to_arg, "DIRTY_IO_PROC"); break; - case ERTS_PSFLG_DIRTY_CPU_PROC_IN_Q: - erts_print(to, to_arg, "DIRTY_CPU_PROC_IN_Q"); break; - case ERTS_PSFLG_DIRTY_IO_PROC_IN_Q: - erts_print(to, to_arg, "DIRTY_IO_PROC_IN_Q"); break; -#endif + case ERTS_PSFLG_DIRTY_ACTIVE_SYS: + erts_print(to, to_arg, "DIRTY_ACTIVE_SYS"); break; default: erts_print(to, to_arg, "UNKNOWN(%d)", chk); break; } |