util: Port nir_array functionality to u_dynarray

Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>

1 files changed, 37 insertions, 10 deletions

diff --git a/src/util/u_dynarray.h b/src/util/u_dynarray.h
index 9143c5a60df..ad3889a7c80 100644
--- a/src/util/u_dynarray.h
+++ b/src/util/u_dynarray.h
@@ -28,6 +28,7 @@
 #define U_DYNARRAY_H
 
 #include <stdlib.h>
+#include "ralloc.h"
 
 /* A zero-initialized version of this is guaranteed to represent an
  * empty array.
@@ -37,37 +38,51 @@
  */
 struct util_dynarray
 {
+   void *mem_ctx;
    void *data;
    unsigned size;
    unsigned capacity;
 };
 
 static inline void
-util_dynarray_init(struct util_dynarray *buf)
+util_dynarray_init(struct util_dynarray *buf, void *mem_ctx)
 {
    memset(buf, 0, sizeof(*buf));
+   buf->mem_ctx = mem_ctx;
 }
 
 static inline void
 util_dynarray_fini(struct util_dynarray *buf)
 {
    if (buf->data) {
-      free(buf->data);
-      util_dynarray_init(buf);
+      if (buf->mem_ctx) {
+         ralloc_free(buf->data);
+      } else {
+         free(buf->data);
+      }
+      util_dynarray_init(buf, buf->mem_ctx);
    }
 }
 
+#define DYN_ARRAY_INITIAL_SIZE 64
+
 /* use util_dynarray_trim to reduce the allocated storage */
 static inline void *
 util_dynarray_resize(struct util_dynarray *buf, unsigned newsize)
 {
    void *p;
    if (newsize > buf->capacity) {
-      unsigned newcap = buf->capacity << 1;
-      if (newsize > newcap)
-	      newcap = newsize;
-      buf->data = realloc(buf->data, newcap);
-      buf->capacity = newcap;
+      if (buf->capacity == 0)
+         buf->capacity = DYN_ARRAY_INITIAL_SIZE;
+
+      while (newsize > buf->capacity)
+         buf->capacity *= 2;
+
+      if (buf->mem_ctx) {
+         buf->data = reralloc_size(buf->mem_ctx, buf->data, buf->capacity);
+      } else {
+         buf->data = realloc(buf->data, buf->capacity);
+      }
    }
 
    p = (void *)((char *)buf->data + buf->size);
@@ -87,10 +102,18 @@ util_dynarray_trim(struct util_dynarray *buf)
 {
    if (buf->size != buf->capacity) {
       if (buf->size) {
-         buf->data = realloc(buf->data, buf->size);
+         if (buf->mem_ctx) {
+            reralloc_size(buf->mem_ctx, buf->data, buf->size);
+         } else {
+            buf->data = realloc(buf->data, buf->size);
+         }
          buf->capacity = buf->size;
       } else {
-         free(buf->data);
+         if (buf->mem_ctx) {
+            ralloc_free(buf->data);
+         } else {
+            free(buf->data);
+         }
          buf->data = 0;
          buf->capacity = 0;
       }
@@ -107,5 +130,9 @@ util_dynarray_trim(struct util_dynarray *buf)
 #define util_dynarray_begin(buf) ((buf)->data)
 #define util_dynarray_end(buf) ((void*)util_dynarray_element((buf), char, (buf)->size))
 
+#define util_dynarray_foreach(buf, type, elem) \
+   for (type *elem = (type *)(buf)->data; \
+        elem < (type *)((char *)(buf)->data + (buf)->size); elem++)
+
 #endif /* U_DYNARRAY_H */