niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve reallocf todo

Browse source
This commit is contained in:
William Woodall 2015-12-16 12:55:33 -08:00
parent 2398e98f66
commit 898f389019
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rcl/include/rcl/allocator.h
View file

@ -43,10 +43,10 @@ typedef struct rcl_allocator_t
void (* deallocate)(void * pointer, void * state); void (* deallocate)(void * pointer, void * state);
/// Reallocate if possible, otherwise it deallocates and allocates. /// Reallocate if possible, otherwise it deallocates and allocates.
/* If unsupported then do deallocate and then allocate. /* If unsupported then do deallocate and then allocate.
* \TODO(wjwwood): should this behave as reallocf?
* This should behave as realloc is described, as opposed to reallocf, i.e. * This should behave as realloc is described, as opposed to reallocf, i.e.
* the memory given by pointer will not be free'd automatically if realloc * the memory given by pointer will not be free'd automatically if realloc
* fails. * fails.
* For reallocf behavior use rcl_reallocf().
* This function must be able to take an input pointer of NULL and succeed. * This function must be able to take an input pointer of NULL and succeed.
*/ */
void * (*reallocate)(void * pointer, size_t size, void * state); void * (*reallocate)(void * pointer, size_t size, void * state);
@ -64,6 +64,14 @@ RCL_PUBLIC
rcl_allocator_t rcl_allocator_t
rcl_get_default_allocator(); rcl_get_default_allocator();
/// Emulate the behavior of reallocf.
/* This function will return NULL if the allocator is NULL or has NULL for
* function pointer fields.
*/
RCL_PUBLIC
void *
rcl_reallocf(void * pointer, size_t size, rcl_allocator_t * allocator);
#if __cplusplus #if __cplusplus
} }
#endif #endif

15
rcl/src/rcl/allocator.c
View file

@ -15,6 +15,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "rcl/allocator.h" #include "rcl/allocator.h"
#include "rcl/error_handling.h"
static void * static void *
__default_allocate(size_t size, void * state) __default_allocate(size_t size, void * state)
@ -48,3 +49,17 @@ rcl_get_default_allocator()
}; };
return default_allocator; return default_allocator;
} }
void *
rcl_reallocf(void * pointer, size_t size, rcl_allocator_t * allocator)
{
if (!allocator || !allocator->reallocate || !allocator->deallocate) {
RCL_SET_ERROR_MSG("invalid allocator or allocator function pointers");
return NULL;
}
void * new_pointer = allocator->reallocate(pointer, size, allocator->state);
if (!new_pointer) {
allocator->deallocate(pointer, allocator->state);
}
return new_pointer;
}