diff options
| author | Rickard Green <[email protected]> | 2016-11-23 14:24:11 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-11-23 14:24:11 +0100 |
| commit | 8d56324cbf72726e955946b9f774f8f1f1004467 (patch) | |
| tree | 5e764a0b2232f7d0d34e60cfd63958532ec63b84 /erts/emulator/beam/beam_bp.h | |
| parent | 7c3bdf14220b500308a14f71aa91139dece2d731 (diff) | |
| parent | 8fade0888ff75fafb2abb512cfb97bcb5472fec1 (diff) | |
| download | otp-8d56324cbf72726e955946b9f774f8f1f1004467.tar.gz otp-8d56324cbf72726e955946b9f774f8f1f1004467.tar.bz2 otp-8d56324cbf72726e955946b9f774f8f1f1004467.zip | |
Merge branch 'maint'
* maint:
Update etp-commands for dirty schedulers
Fix scheduling of system tasks on processes executing dirty
Fix call time tracing with dirty schedulers
Fix send of exit signal to process executing dirty
Fix dirty scheduler process priority
Fix alloc-util hard-debug
Silence debug warning when no beam jump table is used with dirty schedulers
Fix check_process_code() when NifExport is in use
Fix GC when NifExport is in use
Fix saving of original arguments when rescheduling via NifExport
Conflicts:
erts/emulator/beam/beam_bif_load.c
erts/emulator/beam/erl_nif.c
Diffstat (limited to 'erts/emulator/beam/beam_bp.h')
| -rw-r--r-- | erts/emulator/beam/beam_bp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_bp.h b/erts/emulator/beam/beam_bp.h index d32a6bcba5..224b46407d 100644 --- a/erts/emulator/beam/beam_bp.h +++ b/erts/emulator/beam/beam_bp.h @@ -80,7 +80,7 @@ typedef struct generic_bp { #define ERTS_BP_CALL_TIME_SCHEDULE_EXITING (2) #ifdef ERTS_SMP -#define bp_sched2ix_proc(p) (erts_proc_sched_data(p)->no - 1) +#define bp_sched2ix_proc(p) (erts_proc_sched_data(p)->thr_id - 1) #else #define bp_sched2ix_proc(p) (0) #endif |