RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #15688 from bergzand/pr/memarray/inline_short_functions

Browse Source 
memarray: Inline short alloc and free functions
This commit is contained in:
Marian Buschsieweke 2020-12-21 11:25:23 +01:00 committed by GitHub
commit aca895f165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/include/memarray.h
View File

@ -18,8 +18,10 @@
#ifndef MEMARRAY_H #ifndef MEMARRAY_H
#define MEMARRAY_H #define MEMARRAY_H
#include <assert.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -61,7 +63,16 @@ void memarray_init(memarray_t *mem, void *data, size_t size, size_t num);
* @return pointer to allocated structure, if enough memory was available * @return pointer to allocated structure, if enough memory was available
* @return NULL, on failure * @return NULL, on failure
*/ */
void *memarray_alloc(memarray_t *mem); static inline void *memarray_alloc(memarray_t *mem)
{
assert(mem != NULL);
void *free = mem->free_data;
if (free) {
mem->free_data = *((void **)mem->free_data);
}
return free;
}
/** /**
* @brief Allocate and clear memory chunk in memarray pool * @brief Allocate and clear memory chunk in memarray pool
@ -73,7 +84,14 @@ void *memarray_alloc(memarray_t *mem);
* @return pointer to allocated structure, if enough memory was available * @return pointer to allocated structure, if enough memory was available
* @return NULL, on failure * @return NULL, on failure
*/ */
void *memarray_calloc(memarray_t *mem); static inline void *memarray_calloc(memarray_t *mem)
{
void *new = memarray_alloc(mem);
if (new) {
memset(new, 0, mem->size);
}
return new;
}
/** /**
* @brief Free memory chunk in memarray pool * @brief Free memory chunk in memarray pool
@ -84,7 +102,13 @@ void *memarray_calloc(memarray_t *mem);
* @param[in,out] mem memarray pool to free block in * @param[in,out] mem memarray pool to free block in
* @param[in] ptr pointer to memarray chunk * @param[in] ptr pointer to memarray chunk
*/ */
void memarray_free(memarray_t *mem, void *ptr); static inline void memarray_free(memarray_t *mem, void *ptr)
{
assert((mem != NULL) && (ptr != NULL));
memcpy(ptr, &mem->free_data, sizeof(void *));
mem->free_data = ptr;
}
#ifdef __cplusplus #ifdef __cplusplus
} }

31
sys/memarray/memarray.c
View File

@ -31,34 +31,3 @@ void memarray_init(memarray_t *mem, void *data, size_t size, size_t num)
} }
memset(((char *)mem->free_data) + ((mem->num - 1) * (mem->size)), 0, sizeof(void *)); memset(((char *)mem->free_data) + ((mem->num - 1) * (mem->size)), 0, sizeof(void *));
} }
void *memarray_alloc(memarray_t *mem)
{
assert(mem != NULL);
if (mem->free_data == NULL) {
return NULL;
}
void *free = mem->free_data;
mem->free_data = *((void **)mem->free_data);
DEBUG("memarray: Allocate %u Bytes at %p\n", (unsigned)mem->size, free);
return free;
}
void *memarray_calloc(memarray_t *mem)
{
void *new = memarray_alloc(mem);
if (new) {
memset(new, 0, mem->size);
}
return new;
}
void memarray_free(memarray_t *mem, void *ptr)
{
assert((mem != NULL) && (ptr != NULL));
memcpy(ptr, &mem->free_data, sizeof(void *));
mem->free_data = ptr;
DEBUG("memarray: Free %u Bytes at %p\n", (unsigned)mem->size, ptr);
}