diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-14 18:48:00 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-11-29 17:52:38 +0100 |
| commit | 9a88fc02527063be5096bdf4d49a48b144471553 (patch) | |
| tree | 7b0e3ec80f36d1c84d5e0ba144146d5beb1a87a2 | |
| parent | 448b12eb58fd72464c70a493ca77af5c5a9a2a09 (diff) | |
| download | otp-9a88fc02527063be5096bdf4d49a48b144471553.tar.gz otp-9a88fc02527063be5096bdf4d49a48b144471553.tar.bz2 otp-9a88fc02527063be5096bdf4d49a48b144471553.zip | |
erts: Add erts internal secret atom
| -rw-r--r-- | erts/emulator/beam/atom.c | 5 | ||||
| -rw-r--r-- | erts/emulator/beam/atom.h | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/atom.names | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/erts/emulator/beam/atom.c b/erts/emulator/beam/atom.c index b47739059b..2b5ad097a0 100644 --- a/erts/emulator/beam/atom.c +++ b/erts/emulator/beam/atom.c @@ -199,7 +199,7 @@ atom_alloc(Atom* tmpl) static void atom_free(Atom* obj) { - erts_free(ERTS_ALC_T_ATOM, (void*) obj); + ASSERT(obj->slot.index == atom_val(am_ErtsSecretAtom)); } static void latin1_to_utf8(byte* conv_buf, const byte** srcp, int* lenp) @@ -467,6 +467,9 @@ init_atom_table(void) atom_space -= a.len; atom_tab(ix)->name = (byte*)erl_atom_names[i]; } + + /* Hide am_ErtsSecretAtom */ + hash_erase(&erts_atom_table.htable, atom_tab(atom_val(am_ErtsSecretAtom))); } void diff --git a/erts/emulator/beam/atom.h b/erts/emulator/beam/atom.h index f3b21e1687..abd3b44993 100644 --- a/erts/emulator/beam/atom.h +++ b/erts/emulator/beam/atom.h @@ -133,8 +133,6 @@ int atom_table_sz(void); /* table size in bytes, excluding stored objects */ Eterm am_atom_put(const char*, int); /* ONLY 7-bit ascii! */ Eterm erts_atom_put(const byte *name, int len, ErtsAtomEncoding enc, int trunc); -int atom_erase(byte*, int); -int atom_static_put(byte*, int); void init_atom_table(void); void atom_info(fmtfn_t, void *); void dump_atoms(fmtfn_t, void *); diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 66af05c1f2..b1aeed7889 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -59,6 +59,9 @@ atom nocatch atom undefined_function atom undefined_lambda +# Secret internal atom that can never be found by string lookup +# and should never leak out to be seen by the user. +atom ErtsSecretAtom='3RT$' # All other atoms. Try to keep the order alphabetic. # |