diff options
author | Björn-Egil Dahlberg <[email protected]> | 2011-05-12 14:48:28 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2011-05-12 14:48:28 +0200 |
commit | b1e768e86593178810c8a0b3c38443dcf6be5181 (patch) | |
tree | 3256f7af5078db1221738b24060ab8d7a237bb6f /erts/emulator/beam/erl_db_hash.c | |
parent | a2c22ca4bd38644bcfd0611b2d0a72d6c10ce412 (diff) | |
parent | 9b1910d81ae53a4141ab84be6e1b4dd92bf3dde0 (diff) | |
download | otp-b1e768e86593178810c8a0b3c38443dcf6be5181.tar.gz otp-b1e768e86593178810c8a0b3c38443dcf6be5181.tar.bz2 otp-b1e768e86593178810c8a0b3c38443dcf6be5181.zip |
Merge branch 'sverker/halfword-printf-relative-terms/OTP-9292' into dev
* sverker/halfword-printf-relative-terms/OTP-9292:
ETS usage of erts_printf %R
erts_printf %R for relative ets-terms in halfword-vm
Another halfword is_same-bug for ETS ordered_set
Diffstat (limited to 'erts/emulator/beam/erl_db_hash.c')
-rw-r--r-- | erts/emulator/beam/erl_db_hash.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c index 9ef990cc4f..694348e31d 100644 --- a/erts/emulator/beam/erl_db_hash.c +++ b/erts/emulator/beam/erl_db_hash.c @@ -2085,7 +2085,14 @@ static void db_print_hash(int to, void *to_arg, int show, DbTable *tbl) while(list != 0) { if (list->hvalue == INVALID_HASH) erts_print(to, to_arg, "*"); - erts_print(to, to_arg, "%T", make_tuple(list->dbterm.tpl)); + if (tb->common.compress) { + Eterm key = GETKEY(tb, list->dbterm.tpl); + erts_print(to, to_arg, "key=%R", key, list->dbterm.tpl); + } + else { + Eterm obj = make_tuple_rel(list->dbterm.tpl,list->dbterm.tpl); + erts_print(to, to_arg, "%R", obj, list->dbterm.tpl); + } if (list->next != 0) erts_print(to, to_arg, ","); list = list->next; |