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-12-20 10:26:55 -0500
commit570c4da40a76ac9ec8fddfbab202b9290d7d44e5 (patch)
tree63a0d88b7b9a012f766cc05e5389610b793c8bc1 /src/node.c
parent7efe089be0ea0c130c7c12d598adda990b581053 (diff)
downloadserd-570c4da40a76ac9ec8fddfbab202b9290d7d44e5.tar.gz
serd-570c4da40a76ac9ec8fddfbab202b9290d7d44e5.tar.bz2
serd-570c4da40a76ac9ec8fddfbab202b9290d7d44e5.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 b6e5f01d..b31cc01c 100644
--- a/src/node.c
+++ b/src/node.c
@@ -19,6 +19,7 @@
#include "serd_internal.h"
#include "static_nodes.h"
#include "string_utils.h"
+#include "system.h"
#include <assert.h>
#include <float.h>
@@ -92,11 +93,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((uintptr_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;
}
@@ -337,9 +340,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;
}