diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-03-01 17:00:16 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-03-01 17:00:16 +0100 |
| commit | 17f05337776894e05bc2091cbbf98926c4999dfa (patch) | |
| tree | 73ee45a6bd4759177e02214156428fff5275015c /erts | |
| parent | 98d3b0c86ff3d99a4d175291df54c5ed48357fce (diff) | |
| parent | 527bf97b84f9a3d17e5d6b19120ab2dca63111c9 (diff) | |
| download | otp-17f05337776894e05bc2091cbbf98926c4999dfa.tar.gz otp-17f05337776894e05bc2091cbbf98926c4999dfa.tar.bz2 otp-17f05337776894e05bc2091cbbf98926c4999dfa.zip | |
Merge branch 'bjorn/erts/crash-dumps/OTP-9057' into dev
* bjorn/erts/crash-dumps/OTP-9057:
Don't dump the contents of ordered_set ets tables
Write the value "Time left" for BIF timers as an unsigned integer
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_bif_timer.c | 5 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_db_tree.c | 11 |
2 files changed, 3 insertions, 13 deletions
diff --git a/erts/emulator/beam/erl_bif_timer.c b/erts/emulator/beam/erl_bif_timer.c index 3508e8e0dc..db771bd216 100644 --- a/erts/emulator/beam/erl_bif_timer.c +++ b/erts/emulator/beam/erl_bif_timer.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2005-2010. All Rights Reserved. + * Copyright Ericsson AB 2005-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -613,7 +613,8 @@ erts_print_bif_timer_info(int to, void *to_arg) : btm->receiver.proc.ess->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: %d ms\n", erts_time_left(&btm->tm)); + erts_print(to, to_arg, "Time left: %u ms\n", + erts_time_left(&btm->tm)); } } diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c index 484a096249..6cdbec3213 100644 --- a/erts/emulator/beam/erl_db_tree.c +++ b/erts/emulator/beam/erl_db_tree.c @@ -335,7 +335,6 @@ static int doit_select_delete(DbTableTree *tb, TreeDbTerm *this, void *ptr, int forward); -static void do_dump_tree(int to, void *to_arg, TreeDbTerm *t); static int partly_bound_can_match_lesser(Eterm partly_bound_1, Eterm partly_bound_2); @@ -1747,7 +1746,6 @@ static void db_print_tree(int to, void *to_arg, "------------------------------------------------\n"); #else erts_print(to, to_arg, "Ordered set (AVL tree), Elements: %d\n", NITEMS(tb)); - do_dump_tree(to, to_arg, tb->root); #endif } @@ -2063,15 +2061,6 @@ static int analyze_pattern(DbTableTree *tb, Eterm pattern, return DB_ERROR_NONE; } -static void do_dump_tree(int to, void *to_arg, TreeDbTerm *t) -{ - if (t != NULL) { - do_dump_tree(to, to_arg, t->left); - erts_print(to, to_arg, "%T\n", make_tuple(t->dbterm.tpl)); - do_dump_tree(to, to_arg, t->right); - } -} - static int do_free_tree_cont(DbTableTree *tb, int num_left) { TreeDbTerm *root; |