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_db_hash.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_db_hash.c')
| -rw-r--r-- | erts/emulator/beam/erl_db_hash.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c index 038a667b06..c726be5fb4 100644 --- a/erts/emulator/beam/erl_db_hash.c +++ b/erts/emulator/beam/erl_db_hash.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1998-2011. All Rights Reserved. + * Copyright Ericsson AB 1998-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 @@ -105,11 +105,7 @@ #define NSEG_2 256 /* Size of second segment table */ #define NSEG_INC 128 /* Number of segments to grow after that */ -#ifdef ETHR_ORDERED_READ_DEPEND -#define SEGTAB(tb) ((struct segment**)erts_smp_atomic_read_nob(&(tb)->segtab)) -#else -#define SEGTAB(tb) ((struct segment**)erts_smp_atomic_read_rb(&(tb)->segtab)) -#endif +#define SEGTAB(tb) ((struct segment**)erts_smp_atomic_read_ddrb(&(tb)->segtab)) #define NACTIVE(tb) ((int)erts_smp_atomic_read_nob(&(tb)->nactive)) #define NITEMS(tb) ((int)erts_smp_atomic_read_nob(&(tb)->common.nitems)) |