diff options
| author | Rickard Green <[email protected]> | 2013-11-25 09:06:53 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-11-25 09:06:53 +0100 |
| commit | f01eb9919311c6566d38c50625518d1b68aca73c (patch) | |
| tree | 8eacc64cdad1f73e3f7816095f90274f4fc7a217 /erts/emulator/beam/erl_alloc_util.h | |
| parent | 85266798ccd3a55361aa2ffa5c587d4c3f8cc3ae (diff) | |
| parent | e6b3e1499677fa0aff83e0416ea9a58ffab95210 (diff) | |
| download | otp-f01eb9919311c6566d38c50625518d1b68aca73c.tar.gz otp-f01eb9919311c6566d38c50625518d1b68aca73c.tar.bz2 otp-f01eb9919311c6566d38c50625518d1b68aca73c.zip | |
Merge branch 'maint'
* maint:
Fix observer retrieval of alloc info
Fix documentation of the +MMsco switch
Replace the +MMscmgc switch with +MMscrfsd
Add switch for disabling sys_alloc carriers
Add support for locking mappings to physical memory
Diffstat (limited to 'erts/emulator/beam/erl_alloc_util.h')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h index 222f137024..7be6b1ed9d 100644 --- a/erts/emulator/beam/erl_alloc_util.h +++ b/erts/emulator/beam/erl_alloc_util.h @@ -32,6 +32,7 @@ typedef struct Allctr_t_ Allctr_t; typedef struct { UWord ycs; UWord mmc; + int sac; } AlcUInit_t; typedef struct { @@ -75,7 +76,8 @@ typedef struct { #define ERTS_DEFAULT_ALCU_INIT { \ 1024*1024, /* (bytes) ycs: sys_alloc carrier size */\ - ~((UWord) 0) /* (amount) mmc: max mseg carriers */ \ + ~((UWord) 0), /* (amount) mmc: max mseg carriers */\ + 1 /* (bool) sac: sys_alloc carriers */\ } #define ERTS_DEFAULT_ALLCTR_INIT { \ @@ -109,7 +111,8 @@ typedef struct { #define ERTS_DEFAULT_ALCU_INIT { \ 128*1024, /* (bytes) ycs: sys_alloc carrier size */\ - 1024 /* (amount) mmc: max mseg carriers */\ + 1024, /* (amount) mmc: max mseg carriers */\ + 1 /* (bool) sac: sys_alloc carriers */\ } #define ERTS_DEFAULT_ALLCTR_INIT { \ |