diff options
| author | Rickard Green <[email protected]> | 2016-11-23 14:19:41 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-11-23 14:19:41 +0100 |
| commit | 8fade0888ff75fafb2abb512cfb97bcb5472fec1 (patch) | |
| tree | 4fd4a465c9f0041b52aa1d1f3b5ac0e4e832f561 /erts/emulator/beam/beam_emu.c | |
| parent | 2b663d3ff96c74fa87be1120f3cd8960318080a1 (diff) | |
| parent | 00e6b41fd5a83bd3823a62f06e650159b1c73e1c (diff) | |
| download | otp-8fade0888ff75fafb2abb512cfb97bcb5472fec1.tar.gz otp-8fade0888ff75fafb2abb512cfb97bcb5472fec1.tar.bz2 otp-8fade0888ff75fafb2abb512cfb97bcb5472fec1.zip | |
Merge branch 'rickard/dirty-scheduling-fixes' into maint
OTP-14051
* rickard/dirty-scheduling-fixes:
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
Conflicts:
erts/etc/unix/etp-commands.in
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 3be5c0d24c..59a9ea1417 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -5325,7 +5325,7 @@ void erts_dirty_process_main(ErtsSchedulerData *esdp) I = c_p->i; - ASSERT(BeamOp(op_call_nif) == (BeamInstr *) *I); + ASSERT(em_call_nif == (BeamInstr *) *I); /* * Set fcalls even though we ignore it, so we don't |