diff options
| author | John Högberg <[email protected]> | 2018-04-24 16:45:18 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-04-24 16:45:18 +0200 |
| commit | e2a760e691d1b08a2396233fb50cefd98199ba12 (patch) | |
| tree | 3b7d1f2d3ad7b8934dbac263704bc95fc7a7f1e7 /erts/emulator/beam/erl_process.c | |
| parent | 685cd438232282ee0fa790517e7fe193110ff265 (diff) | |
| parent | 573a5abd9d6b1668b49376b489b187780c7125c7 (diff) | |
| download | otp-e2a760e691d1b08a2396233fb50cefd98199ba12.tar.gz otp-e2a760e691d1b08a2396233fb50cefd98199ba12.tar.bz2 otp-e2a760e691d1b08a2396233fb50cefd98199ba12.zip | |
Merge pull request #1790 from jhogberg/john/erts/more-alloc-info/OTP-14961
Improve memory instrumentation
OTP-15024
OTP-14961
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index e8f58a196a..650ec0958c 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -36,7 +36,6 @@ #include "erl_db.h" #include "dist.h" #include "beam_catches.h" -#include "erl_instrument.h" #include "erl_threads.h" #include "erl_binary.h" #include "beam_bp.h" @@ -2508,6 +2507,8 @@ handle_yield(ErtsAuxWorkData *awdp, erts_aint32_t aux_work, int waiting) yield |= erts_handle_yielded_ets_all_request(awdp->esdp, &awdp->yield.ets_all); + yield |= erts_handle_yielded_alcu_blockscan(awdp->esdp, + &awdp->yield.alcu_blockscan); /* * Other yielding operations... @@ -5698,6 +5699,7 @@ init_scheduler_data(ErtsSchedulerData* esdp, int num, esdp->ssi = ssi; esdp->current_process = NULL; esdp->current_port = NULL; + esdp->current_nif = NULL; esdp->virtual_reds = 0; esdp->cpu_id = -1; @@ -8333,6 +8335,7 @@ sched_thread_func(void *vesdp) ERTS_VERIFY_UNUSED_TEMP_ALLOC(NULL); #endif + erts_alcu_sched_spec_data_init(esdp); erts_ets_sched_spec_data_init(esdp); process_main(esdp->x_reg_array, esdp->f_reg_array); |