diff options
| author | Rickard Green <[email protected]> | 2012-02-20 12:20:26 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-02-20 12:20:26 +0100 |
| commit | 3735ecf0815925950db313e56e8d2371afe2207a (patch) | |
| tree | b7df2e64c662b0dac3a00bfadf5e8bfa67c97a60 /erts/emulator/beam/erl_alloc_util.h | |
| parent | 5abac56e443827f755d079873623f42aa74b551e (diff) | |
| parent | 520ddbc83ec87bcec262680bd915184182e3998e (diff) | |
| download | otp-3735ecf0815925950db313e56e8d2371afe2207a.tar.gz otp-3735ecf0815925950db313e56e8d2371afe2207a.tar.bz2 otp-3735ecf0815925950db313e56e8d2371afe2207a.zip | |
Merge branch 'maint'
* maint:
Reduce thread progress read operations in handle_aux_work()
Misc memory barrier fixes
Diffstat (limited to 'erts/emulator/beam/erl_alloc_util.h')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h index fc1eddb116..cedf4ccf85 100644 --- a/erts/emulator/beam/erl_alloc_util.h +++ b/erts/emulator/beam/erl_alloc_util.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2002-2011. All Rights Reserved. + * Copyright Ericsson AB 2002-2012. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -170,7 +170,9 @@ Eterm erts_alcu_info(Allctr_t *, int, int *, void *, Uint **, Uint *); void erts_alcu_init(AlcUInit_t *); void erts_alcu_current_size(Allctr_t *, AllctrSize_t *, ErtsAlcUFixInfo_t *, int); -void erts_alcu_check_delayed_dealloc(Allctr_t *, int, int *, int *); +#ifdef ERTS_SMP +void erts_alcu_check_delayed_dealloc(Allctr_t *, int, int *, ErtsThrPrgrVal *, int *); +#endif erts_aint32_t erts_alcu_fix_alloc_shrink(Allctr_t *, erts_aint32_t); #endif |