mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1305 from bmiklautz/mem_alignment

Browse Source 
winpr: offset support in _aligned_offset_malloc
This commit is contained in:
Marc-André Moreau 2013-06-28 09:39:02 -07:00
commit 48347b1f4d
1 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
winpr/libwinpr/crt/alignment.c
View File

@ -35,32 +35,20 @@
#include <malloc.h> #include <malloc.h>
#endif #endif
struct _aligned_meminfo {
size_t size;
void *base_addr;
};
void* _aligned_malloc(size_t size, size_t alignment) void* _aligned_malloc(size_t size, size_t alignment)
{ {
void* memptr; return _aligned_offset_malloc(size, alignment, 0);
/* alignment must be a power of 2 */
if (alignment % 2 == 1)
return NULL;
#ifdef ANDROID
memptr = memalign(alignment, size);
#else
if (posix_memalign(&memptr, alignment, size) != 0)
return NULL;
#endif
return memptr;
} }
void* _aligned_realloc(void* memblock, size_t size, size_t alignment) void* _aligned_realloc(void* memblock, size_t size, size_t alignment)
{ {
void* memptr = NULL; return _aligned_offset_realloc(memblock, size, alignment, 0);
memptr = realloc(memblock, size);
return memptr;
} }
void* _aligned_recalloc(void* memblock, size_t num, size_t size, size_t alignment) void* _aligned_recalloc(void* memblock, size_t num, size_t size, size_t alignment)
@ -70,36 +58,59 @@ void* _aligned_recalloc(void* memblock, size_t num, size_t size, size_t alignmen
void* _aligned_offset_malloc(size_t size, size_t alignment, size_t offset) void* _aligned_offset_malloc(size_t size, size_t alignment, size_t offset)
{ {
void* memptr; void* memptr, *tmpptr;
struct _aligned_meminfo *ameminfo;
/* alignment must be a power of 2 */ /* alignment must be a power of 2 */
if (alignment % 2 == 1) if (alignment % 2 == 1)
return NULL; return NULL;
/* offset must be less than size */ /* offset must be less than size */
if (offset >= size) if (offset >= size)
return NULL; return NULL;
/* minimum alignment is pointer size */ /* minimum alignment is pointer size */
if (alignment < sizeof(void*)) if (alignment < sizeof(void*))
alignment = sizeof(void*); alignment = sizeof(void*);
#ifdef ANDROID /* malloc size + alignment to make sure we can align afterwards */
memptr = memalign(alignment, size); tmpptr = malloc(size + alignment + sizeof(struct _aligned_meminfo));
#else if (!tmpptr)
if (posix_memalign(&memptr, alignment, size) != 0)
return NULL; return NULL;
#endif
memptr = (void *)((((size_t)((PBYTE)tmpptr + alignment + offset + sizeof(struct _aligned_meminfo)) & ~(alignment - 1)) - offset));
ameminfo = (struct _aligned_meminfo *) (((size_t)((PBYTE)memptr - sizeof(struct _aligned_meminfo))));
ameminfo->base_addr = tmpptr;
ameminfo->size = size;
return memptr; return memptr;
} }
void* _aligned_offset_realloc(void* memblock, size_t size, size_t alignment, size_t offset) void* _aligned_offset_realloc(void* memblock, size_t size, size_t alignment, size_t offset)
{ {
return NULL; struct _aligned_meminfo *ameminfo;
void *newmem;
if (!memblock)
return _aligned_offset_malloc(size, alignment, offset);
if (size == 0)
{
_aligned_free(memblock);
return NULL;
}
/* The following is not very performant but a simple and working solution */
newmem = _aligned_offset_malloc(size, alignment, offset);
if (!newmem)
return NULL;
ameminfo = (struct _aligned_meminfo *) (((size_t)((PBYTE)memblock - sizeof(struct _aligned_meminfo))));
memcpy(newmem, memblock, ameminfo->size);
_aligned_free(memblock);
return newmem;
} }
void* _aligned_offset_recalloc(void* memblock, size_t num, size_t size, size_t alignment, size_t offset) void* _aligned_offset_recalloc(void* memblock, size_t num, size_t size, size_t alignment, size_t offset)
@ -114,7 +125,13 @@ size_t _aligned_msize(void* memblock, size_t alignment, size_t offset)
void _aligned_free(void* memblock) void _aligned_free(void* memblock)
{ {
free(memblock); struct _aligned_meminfo *ameminfo;
if (!memblock)
return;
ameminfo = (struct _aligned_meminfo *) (((size_t)((PBYTE)memblock - sizeof(struct _aligned_meminfo))));
free(ameminfo->base_addr);
} }
#endif #endif