diff options
| author | Rickard Green <rickard@erlang.org> | 2016-11-23 14:24:11 +0100 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2016-11-23 14:24:11 +0100 |
| commit | 8d56324cbf72726e955946b9f774f8f1f1004467 (patch) | |
| tree | 5e764a0b2232f7d0d34e60cfd63958532ec63b84 /erts/emulator/beam/beam_bp.c | |
| parent | 7c3bdf14220b500308a14f71aa91139dece2d731 (diff) | |
| parent | 8fade0888ff75fafb2abb512cfb97bcb5472fec1 (diff) | |
| download | erlang-8d56324cbf72726e955946b9f774f8f1f1004467.tar.gz | |
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.c')
| -rw-r--r-- | erts/emulator/beam/beam_bp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c index 62464f3864..73158205b3 100644 --- a/erts/emulator/beam/beam_bp.c +++ b/erts/emulator/beam/beam_bp.c @@ -1526,7 +1526,7 @@ set_function_break(ErtsCodeInfo *ci, Binary *match_spec, Uint break_flags, ASSERT((bp->flags & ERTS_BPF_TIME_TRACE) == 0); bdt = Alloc(sizeof(BpDataTime)); erts_refc_init(&bdt->refc, 1); - bdt->n = erts_no_schedulers; + bdt->n = erts_no_total_schedulers; bdt->hash = Alloc(sizeof(bp_time_hash_t)*(bdt->n)); for (i = 0; i < bdt->n; i++) { bp_hash_init(&(bdt->hash[i]), 32); |