align: Move min/max/padding/alignment functions to separate files

This commit is contained in:
Martin Willi
2015-04-16 14:50:40 +02:00
parent eaa02bc925
commit 04f12ecd29
6 changed files with 154 additions and 109 deletions
-45
View File
@@ -28,56 +28,11 @@
#endif
#include <library.h>
#include <utils/debug.h>
#include <utils/chunk.h>
#include <collections/enumerator.h>
#include <threading/mutex.h>
#include <threading/condvar.h>
/**
* Described in header.
*/
void* malloc_align(size_t size, u_int8_t align)
{
u_int8_t pad;
void *ptr;
if (align == 0)
{
align = 1;
}
ptr = malloc(align + sizeof(pad) + size);
if (!ptr)
{
return NULL;
}
/* store padding length just before data, down to the allocation boundary
* to do some verification during free_align() */
pad = align - ((uintptr_t)ptr % align);
memset(ptr, pad, pad);
return ptr + pad;
}
/**
* Described in header.
*/
void free_align(void *ptr)
{
u_int8_t pad, *pos;
pos = ptr - 1;
/* verify padding to check any corruption */
for (pad = *pos; (void*)pos >= ptr - pad; pos--)
{
if (*pos != pad)
{
DBG1(DBG_LIB, "!!!! invalid free_align() !!!!");
return;
}
}
free(ptr - pad);
}
#ifdef WIN32
/**