diff options
| author | Rickard Green <[email protected]> | 2012-11-16 09:27:15 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-11-16 09:27:15 +0100 |
| commit | 952d8eb752c8ac5ff029b442404c5fe647c9af38 (patch) | |
| tree | 3d1c396034f3262178d6098de0f17750a18c02b3 /erts | |
| parent | bdc34f0f247628bc285143f250192e4c6016c812 (diff) | |
| parent | fbc7ec5ca3d3c332be007e991a4a68f4b742c8ef (diff) | |
| download | otp-952d8eb752c8ac5ff029b442404c5fe647c9af38.tar.gz otp-952d8eb752c8ac5ff029b442404c5fe647c9af38.tar.bz2 otp-952d8eb752c8ac5ff029b442404c5fe647c9af38.zip | |
Merge branch 'rickard/ets-mem-bug/OTP-10558' into maint
* rickard/ets-mem-bug/OTP-10558:
Fix erlang:memory(ets)
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_db.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c index 51bdf53823..7409564167 100644 --- a/erts/emulator/beam/erl_db.c +++ b/erts/emulator/beam/erl_db.c @@ -250,7 +250,6 @@ free_dbtable(DbTable* tb) #endif ASSERT(is_immed(tb->common.heir_data)); erts_db_free(ERTS_ALC_T_DB_TABLE, tb, (void *) tb, sizeof(DbTable)); - ERTS_ETS_MISC_MEM_ADD(-sizeof(DbTable)); ERTS_SMP_MEMORY_BARRIER; } @@ -1443,7 +1442,6 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2) erts_smp_atomic_init_nob(&init_tb.common.memory_size, 0); tb = (DbTable*) erts_db_alloc(ERTS_ALC_T_DB_TABLE, &init_tb, sizeof(DbTable)); - ERTS_ETS_MISC_MEM_ADD(sizeof(DbTable)); erts_smp_atomic_init_nob(&tb->common.memory_size, erts_smp_atomic_read_nob(&init_tb.common.memory_size)); } @@ -2888,7 +2886,6 @@ void init_db(void) meta_pid_to_tab = (DbTable*) erts_db_alloc(ERTS_ALC_T_DB_TABLE, &init_tb, sizeof(DbTable)); - ERTS_ETS_MISC_MEM_ADD(sizeof(DbTable)); erts_smp_atomic_init_nob(&meta_pid_to_tab->common.memory_size, erts_smp_atomic_read_nob(&init_tb.common.memory_size)); @@ -2920,7 +2917,6 @@ void init_db(void) meta_pid_to_fixed_tab = (DbTable*) erts_db_alloc(ERTS_ALC_T_DB_TABLE, &init_tb, sizeof(DbTable)); - ERTS_ETS_MISC_MEM_ADD(sizeof(DbTable)); erts_smp_atomic_init_nob(&meta_pid_to_fixed_tab->common.memory_size, erts_smp_atomic_read_nob(&init_tb.common.memory_size)); |