aboutsummaryrefslogtreecommitdiffstats
path: root/src/node.c
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-04-09 10:28:59 +0200
committerDavid Robillard <d@drobilla.net>2019-04-13 19:48:23 +0200
commitd4a61bf102a9d62ea2ef9ed886cae5f666ea7607 (patch)
treee1b3c8f8782372b1e135ec22f884d84491c0eb27 /src/node.c
parenta1bd26b8ed3572e6b9e6647c092ed87b31771736 (diff)
downloadserd-d4a61bf102a9d62ea2ef9ed886cae5f666ea7607.tar.gz
serd-d4a61bf102a9d62ea2ef9ed886cae5f666ea7607.tar.bz2
serd-d4a61bf102a9d62ea2ef9ed886cae5f666ea7607.zip
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).
Diffstat (limited to 'src/node.c')
-rw-r--r--src/node.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/node.c b/src/node.c
index 0f95d14a..2f21858e 100644
--- a/src/node.c
+++ b/src/node.c
@@ -18,6 +18,7 @@
#include "serd_internal.h"
#include "string_utils.h"
+#include "system.h"
#include "warnings.h"
#include <assert.h>
@@ -114,11 +115,13 @@ SerdNode*
serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdNodeType type)
{
const size_t size = sizeof(SerdNode) + serd_node_pad_size(n_bytes);
- SerdNode* node = (SerdNode*)calloc(1, size);
+ SerdNode* node = (SerdNode*)serd_calloc_aligned(size, serd_node_align);
+
+ assert((intptr_t)node % serd_node_align == 0);
+
node->n_bytes = 0;
node->flags = flags;
node->type = type;
- assert((intptr_t)node % serd_node_align == 0);
return node;
}
@@ -280,9 +283,13 @@ serd_node_copy(const SerdNode* node)
return NULL;
}
- const size_t size = serd_node_total_size(node);
serd_node_check_padding(node);
- SerdNode* copy = (SerdNode*)calloc(1, size + 3);
+
+ const size_t size = serd_node_total_size(node);
+ SerdNode* copy = (SerdNode*)serd_calloc_aligned(size + 3, serd_node_align);
+
+ assert((intptr_t)node % serd_node_align == 0);
+
memcpy(copy, node, size);
return copy;
}