diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-05-12 14:48:15 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-05-12 14:48:15 +0200 |
| commit | a2c22ca4bd38644bcfd0611b2d0a72d6c10ce412 (patch) | |
| tree | fc6226a4d945394ed9c626e9dc5607acc1155c97 /erts/emulator/sys/common/erl_mseg.h | |
| parent | eb26a54528e824f8f08af49d47281201bd8fefe3 (diff) | |
| parent | 742722ec551b7cd4f9ee53190443ee422bb8c794 (diff) | |
| download | otp-a2c22ca4bd38644bcfd0611b2d0a72d6c10ce412.tar.gz otp-a2c22ca4bd38644bcfd0611b2d0a72d6c10ce412.tar.bz2 otp-a2c22ca4bd38644bcfd0611b2d0a72d6c10ce412.zip | |
Merge branch 'sverker/halfword-high-alloc/OTP-9291' into dev
* sverker/halfword-high-alloc/OTP-9291:
Present 'low' memory count for halfword-vm with erlang:memory()
Fix faulty values from erlang:memory() on halfword-vm
Allow allocator disable for high memory (better valgrind for halfword)
Expand the use of high memory allocation in halfword emulator
Diffstat (limited to 'erts/emulator/sys/common/erl_mseg.h')
| -rw-r--r-- | erts/emulator/sys/common/erl_mseg.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/erts/emulator/sys/common/erl_mseg.h b/erts/emulator/sys/common/erl_mseg.h index d8053eb0d9..fbb66ee33b 100644 --- a/erts/emulator/sys/common/erl_mseg.h +++ b/erts/emulator/sys/common/erl_mseg.h @@ -60,15 +60,12 @@ typedef struct { int preserv; UWord abs_shrink_th; UWord rel_shrink_th; +#if HALFWORD_HEAP + int low_mem; +#endif } ErtsMsegOpt_t; -#define ERTS_MSEG_DEFAULT_OPT_INITIALIZER \ -{ \ - 1, /* Use cache */ \ - 1, /* Preserv data */ \ - 0, /* Absolute shrink threshold */ \ - 0 /* Relative shrink threshold */ \ -} +extern const ErtsMsegOpt_t erts_mseg_default_opt; void *erts_mseg_alloc(ErtsAlcType_t, Uint *); void *erts_mseg_alloc_opt(ErtsAlcType_t, Uint *, const ErtsMsegOpt_t *); |