diff options
| author | Rickard Green <[email protected]> | 2017-09-05 14:40:33 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-09-05 14:40:33 +0200 |
| commit | 67f6114d3701dd38614acf520f13c07174a99d11 (patch) | |
| tree | f0fa9d412359ba9ee3b8be2c098fc49bc72fc8f3 /erts/emulator/beam/erl_lock_check.c | |
| parent | 60c836afbb7c993f3bd635e12c80f018aa017e3b (diff) | |
| parent | 5a45d2917cd14bf5eab690453e8a191549de4c2c (diff) | |
| download | otp-67f6114d3701dd38614acf520f13c07174a99d11.tar.gz otp-67f6114d3701dd38614acf520f13c07174a99d11.tar.bz2 otp-67f6114d3701dd38614acf520f13c07174a99d11.zip | |
Merge branch 'rickard/statistics-time-fixes/OTP-14597/ERL-465' into maint
* rickard/statistics-time-fixes/OTP-14597/ERL-465:
Bug fixes of statistics(wall_clock) and statistics(runtime)
Conflicts:
erts/emulator/beam/erl_time_sup.c
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index cf091ee43f..189c88ac4a 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -171,9 +171,9 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "xports_list_pre_alloc_lock", "address" }, { "inet_buffer_stack_lock", NULL }, { "system_block", NULL }, - { "timeofday", NULL }, { "get_time", NULL }, { "get_corrected_time", NULL }, + { "runtime", NULL }, { "breakpoints", NULL }, { "pix_lock", "address" }, { "run_queues_lists", NULL }, |