diff options
author | Björn-Egil Dahlberg <[email protected]> | 2013-10-21 17:04:33 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2013-10-21 17:04:33 +0200 |
commit | 76c6d8fcc4f31ce5e1310f18dcf43107c74ae513 (patch) | |
tree | 3a1b811525d2b2a6d1dc1b17928e691ac8492527 /erts | |
parent | 3c1645fa6852d9f15269cfeef41d11b1bf149460 (diff) | |
parent | 683281e2362ab950810141647fc7ce3654ffc4c8 (diff) | |
download | otp-76c6d8fcc4f31ce5e1310f18dcf43107c74ae513.tar.gz otp-76c6d8fcc4f31ce5e1310f18dcf43107c74ae513.tar.bz2 otp-76c6d8fcc4f31ce5e1310f18dcf43107c74ae513.zip |
Merge branch 'egil/r17/fix-crashdump-printout/OTP-11419'
* egil/r17/fix-crashdump-printout/OTP-11419:
erts: Remove space in 'Buckets' printout
erts: Remove unit in 'Time left' printout
Diffstat (limited to 'erts')
-rw-r--r-- | erts/emulator/beam/erl_bif_timer.c | 2 | ||||
-rw-r--r-- | erts/emulator/beam/erl_db_hash.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_bif_timer.c b/erts/emulator/beam/erl_bif_timer.c index d67695e533..03ac97283c 100644 --- a/erts/emulator/beam/erl_bif_timer.c +++ b/erts/emulator/beam/erl_bif_timer.c @@ -616,7 +616,7 @@ erts_print_bif_timer_info(int to, void *to_arg) : btm->receiver.proc.ess->common.id); erts_print(to, to_arg, "=timer:%T\n", receiver); erts_print(to, to_arg, "Message: %T\n", btm->message); - erts_print(to, to_arg, "Time left: %u ms\n", + erts_print(to, to_arg, "Time left: %u\n", erts_time_left(&btm->tm)); } } diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c index 2fea4671e1..06dac8f161 100644 --- a/erts/emulator/beam/erl_db_hash.c +++ b/erts/emulator/beam/erl_db_hash.c @@ -2106,7 +2106,7 @@ static void db_print_hash(int to, void *to_arg, int show, DbTable *tbl) DbTableHash *tb = &tbl->hash; int i; - erts_print(to, to_arg, "Buckets: %d \n", NACTIVE(tb)); + erts_print(to, to_arg, "Buckets: %d\n", NACTIVE(tb)); if (show) { for (i = 0; i < NACTIVE(tb); i++) { |