diff options
| author | Sverker Eriksson <[email protected]> | 2018-05-07 18:18:17 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-05-08 14:38:43 +0200 |
| commit | e7579f608a1bdb52271c57e9ad69a7752ea1371b (patch) | |
| tree | 564e993798e57172de8c959d762b32616200638f /erts/emulator/beam/erl_db_tree.c | |
| parent | c500b0acdad588fa4c3d0cba15a9c61dc30a3190 (diff) | |
| download | otp-e7579f608a1bdb52271c57e9ad69a7752ea1371b.tar.gz otp-e7579f608a1bdb52271c57e9ad69a7752ea1371b.tar.bz2 otp-e7579f608a1bdb52271c57e9ad69a7752ea1371b.zip | |
erts: Rename untrapping db_free_*empty*_table
as it's now only used for empty tables by ets:new/2.
Diffstat (limited to 'erts/emulator/beam/erl_db_tree.c')
| -rw-r--r-- | erts/emulator/beam/erl_db_tree.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c index 4dcb41523f..0692583dd4 100644 --- a/erts/emulator/beam/erl_db_tree.c +++ b/erts/emulator/beam/erl_db_tree.c @@ -417,7 +417,7 @@ static int db_select_replace_continue_tree(Process *p, DbTable *tbl, static int db_take_tree(Process *, DbTable *, Eterm, Eterm *); static void db_print_tree(fmtfn_t to, void *to_arg, int show, DbTable *tbl); -static int db_free_table_tree(DbTable *tbl); +static int db_free_empty_table_tree(DbTable *tbl); static SWord db_free_table_continue_tree(DbTable *tbl, SWord); @@ -470,7 +470,7 @@ DbTableMethod db_tree = db_select_replace_continue_tree, db_take_tree, db_delete_all_objects_tree, - db_free_table_tree, + db_free_empty_table_tree, db_free_table_continue_tree, db_print_tree, db_foreach_offheap_tree, @@ -1969,8 +1969,9 @@ static void db_print_tree(fmtfn_t to, void *to_arg, } /* release all memory occupied by a single table */ -static int db_free_table_tree(DbTable *tbl) +static int db_free_empty_table_tree(DbTable *tbl) { + ASSERT(tbl->tree.root == NULL); while (db_free_table_continue_tree(tbl, ERTS_SWORD_MAX) < 0) ; return 1; |