diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-09-30 17:02:55 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-09-30 17:02:55 +0200 |
| commit | e0ecc86e35475b434efa6cccba44074ca1040b7a (patch) | |
| tree | 13f1622acea6b0af4536eb739af58a351b1fb8bf /erts/emulator/beam/erl_alloc.h | |
| parent | e6b5ae09d292ee0251aab875be1d3245f260b493 (diff) | |
| parent | abac2eda110a33d8310c0f9cc152d91de37f731d (diff) | |
| download | otp-e0ecc86e35475b434efa6cccba44074ca1040b7a.tar.gz otp-e0ecc86e35475b434efa6cccba44074ca1040b7a.tar.bz2 otp-e0ecc86e35475b434efa6cccba44074ca1040b7a.zip | |
Merge branch 'maint-r16' into maint
Conflicts:
erts/vsn.mk
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 *); |