diff options
| author | Rickard Green <[email protected]> | 2013-08-23 17:29:58 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-09-30 17:45:44 +0200 |
| commit | ef3da907bd566b43a4022f1cbb1ae3d103b9ec3e (patch) | |
| tree | 4268ac511df4754087bccb80367466fd2eea3492 /erts/emulator/beam/erl_alloc.c | |
| parent | c2dbcb69929ac18e7687f1df1de6613b34e2897b (diff) | |
| download | otp-ef3da907bd566b43a4022f1cbb1ae3d103b9ec3e.tar.gz otp-ef3da907bd566b43a4022f1cbb1ae3d103b9ec3e.tar.bz2 otp-ef3da907bd566b43a4022f1cbb1ae3d103b9ec3e.zip | |
erts: erts_mmap supercarrier management and erts_mseg usage
* Coalescing and trimming of free segments in supercarrier
* Management of super aligned and super unaligned areas in
supercarrier
* Management of reservation of physical memory
* erts_mseg usage of erts_mmap
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index 2babe2f416..e30b3e7b51 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -718,6 +718,7 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop) init.mseg.nos = erts_no_schedulers; erts_mseg_init(&init.mseg); #endif + erts_alcu_init(&init.alloc_util); erts_afalc_init(); erts_bfalc_init(); @@ -1178,7 +1179,7 @@ static UWord get_mb_value(char *param_end, char** argv, int* ip) { SWord tmp; - UWord max = ((~((Uint) 0))/(1024*1024)) + 1; + UWord max = ((~((UWord) 0))/(1024*1024)) + 1; char *rest; char *param = argv[*ip]+1; char *value = get_value(param_end, argv, ip); @@ -1479,6 +1480,12 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init) #endif get_bool_value(argv[i]+6, argv, &i); } + else if (has_prefix("scrpm", argv[i]+3)) { +#if HAVE_ERTS_MSEG + init->mseg.mmap.scrpm = +#endif + get_bool_value(argv[i]+8, argv, &i); + } else if (has_prefix("scmgc", argv[i]+3)) { #if HAVE_ERTS_MSEG init->mseg.mmap.scmgc = |