AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/dynarray: allow an initial stack allocation to be used

Browse Source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21381>
This commit is contained in:
Rhys Perry
2023-02-10 15:36:56 +00:00
committed by Marge Bot
parent 87efb9c3b3
commit 63e8f77d8e
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/u_dynarray.h
+23 -2
View File
@@ -36,6 +36,8 @@
extern "C" {
#endif
static unsigned util_dynarray_is_data_stack_allocated;
/* A zero-initialized version of this is guaranteed to represent an
* empty array.
*
@@ -57,11 +59,21 @@ util_dynarray_init(struct util_dynarray *buf, void *mem_ctx)
buf->mem_ctx = mem_ctx;
}
static inline void
util_dynarray_init_from_stack(struct util_dynarray *buf, void *data, unsigned capacity)
{
memset(buf, 0, sizeof(*buf));
buf->mem_ctx = &util_dynarray_is_data_stack_allocated;
buf->data = data;
buf->capacity = capacity;
}
static inline void
util_dynarray_fini(struct util_dynarray *buf)
{
if (buf->data) {
if (buf->mem_ctx) {
if (buf->mem_ctx == &util_dynarray_is_data_stack_allocated) {
} else if (buf->mem_ctx) {
ralloc_free(buf->data);
} else {
free(buf->data);
@@ -85,7 +97,13 @@ util_dynarray_ensure_cap(struct util_dynarray *buf, unsigned newcap)
unsigned capacity = MAX3(DYN_ARRAY_INITIAL_SIZE, buf->capacity * 2, newcap);
void *data;
if (buf->mem_ctx) {
if (buf->mem_ctx == &util_dynarray_is_data_stack_allocated) {
data = malloc(capacity);
if (data) {
memcpy(data, buf->data, buf->size);
buf->mem_ctx = NULL;
}
} else if (buf->mem_ctx) {
data = reralloc_size(buf->mem_ctx, buf->data, capacity);
} else {
data = realloc(buf->data, capacity);
@@ -148,6 +166,9 @@ util_dynarray_grow_bytes(struct util_dynarray *buf, unsigned ngrow, size_t eltsi
static inline void
util_dynarray_trim(struct util_dynarray *buf)
{
if (buf->mem_ctx == &util_dynarray_is_data_stack_allocated)
return;
if (buf->size != buf->capacity) {
if (buf->size) {
if (buf->mem_ctx) {