diff options
| author | Sverker Eriksson <[email protected]> | 2016-01-21 19:53:59 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-01-21 20:11:04 +0100 |
| commit | 66a80a7ab735a22249ffbbb7c88eccebba906194 (patch) | |
| tree | 955314b6651ecbb9be2c43bdbd5037205bb52dc5 /erts/emulator/beam/erl_alloc.c | |
| parent | 632eb0ee2fbad692255ca2b1d0c3300fd0b6e492 (diff) | |
| download | otp-66a80a7ab735a22249ffbbb7c88eccebba906194.tar.gz otp-66a80a7ab735a22249ffbbb7c88eccebba906194.tar.bz2 otp-66a80a7ab735a22249ffbbb7c88eccebba906194.zip | |
erts: Add checks for thread safe allocation
Assert thread unsafe allocator is only created on non-smp
and only called by the main thread.
Removed test of unsafe allocator in custom thread.
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index 5544712e8d..e7523ac989 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -968,6 +968,10 @@ set_au_allocator(ErtsAlcType_t alctr_n, struct au_init *init, int ncpu) else #endif { +#ifdef ERTS_SMP + erl_exit(ERTS_ABORT_EXIT, "%salloc is not thread safe\n", + init->init.util.name_prefix); +#else af->alloc = erts_alcu_alloc; if (init->init.util.fix_type_size) af->realloc = erts_realloc_fixed_size; @@ -976,6 +980,7 @@ set_au_allocator(ErtsAlcType_t alctr_n, struct au_init *init, int ncpu) else af->realloc = erts_alcu_realloc; af->free = erts_alcu_free; +#endif } af->extra = NULL; ai->alloc_util = 1; @@ -3402,8 +3407,11 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3) init.enable = 1; init.atype = GOODFIT; init.init.util.name_prefix = (char *) a1; - init.init.util.ts = a2 ? 1 : 0; - +#ifdef ERTS_SMP + init.init.util.ts = 1; +#else + init.init.util.ts = a2 ? 1 : 0; +#endif if ((char **) a3) { char **argv = (char **) a3; int i = 0; |