tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[utils] adding aligned malloc/free/realloc in vector.h and matrix.h, fixing bug in matrix_copy

Browse Source
This commit is contained in:
Al
2017-03-07 16:25:34 -05:00
parent 242b1364ae
commit b6bf8da383
2 changed files with 175 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/matrix.h
View File

@@ -45,6 +45,26 @@
\
} \
\
static name##_t *name##_new_aligned(size_t m, size_t n, size_t alignment) { \
name##_t *matrix = malloc(sizeof(name##_t)); \
\
if (matrix == NULL) { \
return NULL; \
} \
\
matrix->m = m; \
matrix->n = n; \
\
matrix->values = _aligned_malloc(sizeof(type) * m * n, alignment); \
if (matrix->values == NULL) { \
free(matrix); \
return NULL; \
} \
\
return matrix; \
\
} \
\
static void name##_destroy(name##_t *self) { \
if (self == NULL) return; \
\
@@ -55,6 +75,16 @@
free(self); \
} \
\
static void name##_destroy_aligned(name##_t *self) { \
if (self == NULL) return; \
\
if (self->values != NULL) { \
_aligned_free(self->values); \
} \
\
free(self); \
} \
\
static inline void name##_zero(name##_t *self) { \
memset(self->values, 0, self->m * self->n * sizeof(type)); \
} \
@@ -64,10 +94,30 @@
if (self == NULL) return false; \
\
if (m * n > (self->m * self->n)) { \
self->values = realloc(self->values, sizeof(type) * m * n); \
if (self->values == NULL) { \
type *ptr = realloc(self->values, sizeof(type) * m * n); \
if (ptr == NULL) { \
return false; \
} \
self->values = ptr; \
} \
\
self->m = m; \
self->n = n; \
\
name##_zero(self); \
\
return true; \
} \
\
static inline bool name##_resize_aligned(name##_t *self, size_t m, size_t n, size_t alignment) { \
if (self == NULL) return false; \
\
if (m * n > (self->m * self->n)) { \
type *ptr = _aligned_realloc(self->values, sizeof(type) * m * n, alignment); \
if (ptr == NULL) { \
return false; \
} \
self->values = ptr; \
} \
\
self->m = m; \
@@ -90,7 +140,7 @@
if (self->m != other->m || self->n != other->n) { \
return false; \
} \
size_t num_values = self->n * self->n; \
size_t num_values = self->m * self->n; \
\
memcpy(other->values, self->values, num_values * sizeof(type)); \
return true; \