diff options
| author | Rickard Green <[email protected]> | 2012-11-16 09:31:56 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-11-16 09:31:56 +0100 |
| commit | cb11b4d6ec812813d0df07facc02ac5bd47e6851 (patch) | |
| tree | 355c2048bf1fcee6392a32be9ed921b3caa3c188 /erts/emulator/beam | |
| parent | 9b7d4359fd771fc3e7589dc91e091c7c35a65807 (diff) | |
| parent | 15f3cb7cb7074d507f70e778862e285e844b8546 (diff) | |
| download | otp-cb11b4d6ec812813d0df07facc02ac5bd47e6851.tar.gz otp-cb11b4d6ec812813d0df07facc02ac5bd47e6851.tar.bz2 otp-cb11b4d6ec812813d0df07facc02ac5bd47e6851.zip | |
Merge branch 'maint'
* maint:
Add clearer warnings about misuse of NIF and driver functionality
Fix erlang:memory(ets)
Conflicts:
erts/emulator/beam/erl_db.c
Diffstat (limited to 'erts/emulator/beam')
| -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 4c30905495..1ba1048afa 100644 --- a/erts/emulator/beam/erl_db.c +++ b/erts/emulator/beam/erl_db.c @@ -251,7 +251,6 @@ free_dbtable(void *vtb) #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)); } static void schedule_free_dbtable(DbTable* tb) @@ -1423,7 +1422,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)); } @@ -2867,7 +2865,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)); @@ -2899,7 +2896,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)); |