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.c | |
| 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.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index 4d02a67d54..df27186680 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -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 @@ -1577,9 +1577,11 @@ erts_alloc_register_scheduler(void *vesdp) } } +#ifdef ERTS_SMP void erts_alloc_scheduler_handle_delayed_dealloc(void *vesdp, int *need_thr_progress, + ErtsThrPrgrVal *thr_prgr_p, int *more_work) { ErtsSchedulerData *esdp = (ErtsSchedulerData *) vesdp; @@ -1599,10 +1601,12 @@ erts_alloc_scheduler_handle_delayed_dealloc(void *vesdp, erts_alcu_check_delayed_dealloc(allctr, 1, need_thr_progress, + thr_prgr_p, more_work); } } } +#endif erts_aint32_t erts_alloc_fix_alloc_shrink(int ix, erts_aint32_t flgs) |