diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-11-14 17:08:17 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-12-14 15:12:22 +0100 |
| commit | 9d487e5c1385c074f50388a777e808a40cebaf8b (patch) | |
| tree | 84e1f2820432bee01d5389c2593a4f97028f084b | |
| parent | c519fd567d661d7d75a678455b2e9651ba3b421d (diff) | |
| download | otp-9d487e5c1385c074f50388a777e808a40cebaf8b.tar.gz otp-9d487e5c1385c074f50388a777e808a40cebaf8b.tar.bz2 otp-9d487e5c1385c074f50388a777e808a40cebaf8b.zip | |
erts: Use aligned bits as constant in mseg_alloc
HAVE_SUPER_ALIGNED_MB_CARRIERS is always true with mmap and thus
aligned bits is a constant and so is "page" size for mmap.
Conflicts:
erts/emulator/sys/common/erl_mseg.h
| -rw-r--r-- | erts/emulator/sys/common/erl_mseg.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/erts/emulator/sys/common/erl_mseg.h b/erts/emulator/sys/common/erl_mseg.h index f260c6506f..8f8cb0e121 100644 --- a/erts/emulator/sys/common/erl_mseg.h +++ b/erts/emulator/sys/common/erl_mseg.h @@ -39,9 +39,17 @@ #endif #if HAVE_SUPER_ALIGNED_MB_CARRIERS -# define MSEG_ALIGN_BITS (17) /*SVERK Configure me! */ +# define MSEG_ALIGN_BITS (17) #else -# define MSEG_ALIGN_BITS (12) /*SVERK Configure me! */ +/* If we don't use super aligned multiblock carriers + * we will mmap with page size alignment (and thus use corresponding + * align bits). + * + * Current implementation needs this to be a constant and + * only uses this for user dev testing so setting page size + * to 4096 (12 bits) is fine. + */ +# define MSEG_ALIGN_BITS (12) #endif #if HAVE_ERTS_MSEG |