diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-09-30 17:03:15 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-09-30 17:03:15 +0200 |
| commit | 036727ce61cfbd51ece3d20a07d33c10c035ecec (patch) | |
| tree | 783765a9157270e59469e33755f0c31564c52f90 /erts/emulator/beam/erl_alloc.h | |
| parent | 157c52840b3a83da5f753d932acae3480bf4bfd2 (diff) | |
| parent | e0ecc86e35475b434efa6cccba44074ca1040b7a (diff) | |
| download | otp-036727ce61cfbd51ece3d20a07d33c10c035ecec.tar.gz otp-036727ce61cfbd51ece3d20a07d33c10c035ecec.tar.bz2 otp-036727ce61cfbd51ece3d20a07d33c10c035ecec.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_alloc.h')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h index b5975c6c32..f83f6b39cf 100644 --- a/erts/emulator/beam/erl_alloc.h +++ b/erts/emulator/beam/erl_alloc.h @@ -54,6 +54,16 @@ void erts_sys_alloc_init(void); void *erts_sys_alloc(ErtsAlcType_t, void *, Uint); void *erts_sys_realloc(ErtsAlcType_t, void *, void *, Uint); void erts_sys_free(ErtsAlcType_t, void *, void *); +#if ERTS_HAVE_ERTS_SYS_ALIGNED_ALLOC +/* + * Note 'alignment' must remain the same in calls to + * 'erts_sys_aligned_realloc()' and 'erts_sys_aligned_free()' + * as in the initial call to 'erts_sys_aligned_alloc()'. + */ +void *erts_sys_aligned_alloc(UWord alignment, UWord size); +void *erts_sys_aligned_realloc(UWord alignment, void *ptr, UWord size, UWord old_size); +void erts_sys_aligned_free(UWord alignment, void *ptr); +#endif Eterm erts_memory(int *, void *, void *, Eterm); Eterm erts_allocated_areas(int *, void *, void *); |