From 570c4da40a76ac9ec8fddfbab202b9290d7d44e5 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 9 Apr 2019 10:28:59 +0200 Subject: Allocate nodes with posix_memalign when available This fixes platforms where the system malloc returns memory that is not aligned to sizeof(SerdNode) (128 bits). --- src/system.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'src/system.c') diff --git a/src/system.c b/src/system.c index 1af179f5..4d8633ee 100644 --- a/src/system.c +++ b/src/system.c @@ -1,5 +1,5 @@ /* - Copyright 2011-2018 David Robillard + Copyright 2011-2019 David Robillard Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -21,15 +21,36 @@ #include "serd_config.h" #include +#include void* -serd_allocate_buffer(size_t size) +serd_malloc_aligned(size_t size, size_t alignment) { #ifdef HAVE_POSIX_MEMALIGN - void* ptr; - const int ret = posix_memalign(&ptr, SERD_PAGE_SIZE, size); + void* ptr = NULL; + const int ret = posix_memalign(&ptr, alignment, size); return ret ? NULL : ptr; #else return malloc(size); #endif } + +void* +serd_calloc_aligned(size_t size, size_t alignment) +{ +#ifdef HAVE_POSIX_MEMALIGN + void* ptr = serd_malloc_aligned(size, alignment); + if (ptr) { + memset(ptr, 0, size); + } + return ptr; +#else + return calloc(1, size); +#endif +} + +void* +serd_allocate_buffer(size_t size) +{ + return serd_malloc_aligned(size, SERD_PAGE_SIZE); +} -- cgit v1.2.1