X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=common%2Farray.h;h=fe3dded2074908f1ee1857627331b041665fd737;hb=913c6a51acdb1e8a6acc88fbcceac8d0a09450b7;hp=ed12b5b384566796ae90158236085abc9a9f7c2d;hpb=929bb1ca2452a5bc7410896fd4e5eea44901a0b7;p=apps%2Fpfixtools.git

diff --git a/common/array.h b/common/array.h
index ed12b5b..fe3dded 100644
--- a/common/array.h
+++ b/common/array.h
@@ -43,9 +43,29 @@
 #define PRIV_ARRAY(Type)                                                       \
     struct {                                                                   \
         Type    *data;                                                         \
-        ssize_t len;                                                           \
-        ssize_t size;                                                          \
+        uint32_t len;                                                          \
+        uint32_t size;                                                         \
+        unsigned locked : 1;                                                   \
     }
+
+#define PARRAY(Type)                                                           \
+    typedef PRIV_ARRAY(Type*) Type ## _ptr_array_t;                            \
+    static inline Type ## _ptr_array_t *Type ## _ptr_array_new(void)           \
+    {                                                                          \
+        return p_new(Type ## _ptr_array_t, 1);                                 \
+    }                                                                          \
+                                                                               \
+    static inline void Type ## _ptr_array_delete(Type ## _ptr_array_t **array) \
+    {                                                                          \
+        if (*array) {                                                          \
+            if ((*array)->locked) {                                            \
+                array_unlock(**array);                                         \
+            }                                                                  \
+            array_wipe(**array);                                               \
+            p_delete(array);                                                   \
+        }                                                                      \
+    }
+
 #define ARRAY(Type)                                                            \
     typedef PRIV_ARRAY(Type) Type ## _array_t;                                 \
                                                                                \
@@ -57,17 +77,31 @@
     static inline void Type ## _array_delete(Type ## _array_t **array)         \
     {                                                                          \
         if (*array) {                                                          \
+            if ((*array)->locked) {                                            \
+                array_unlock(**array);                                         \
+            }                                                                  \
             array_wipe(**array);                                               \
             p_delete(array);                                                   \
         }                                                                      \
-    }
+    }                                                                          \
+                                                                               \
+    PARRAY(Type)
+
 #define A(Type) Type ## _array_t
+#define PA(Type) Type ## _ptr_array_t
 
-#define ARRAY_INIT { NULL, 0, 0 }
+#define ARRAY_INIT { NULL, 0, 0, false }
 
 #define array_init(array) (array) = ARRAY_INIT
+
+#define array_can_edit(array) (!(array).locked)
+
+#define array_ensure_can_edit(array)                                           \
+    assert(array_can_edit(array) && "Trying to edit array while it is locked")
+
 #define array_wipe(array)                                                      \
     do {                                                                       \
+        array_ensure_can_edit(array);                                          \
         p_delete(&(array).data);                                               \
         (array).len  = 0;                                                      \
         (array).size = 0;                                                      \
@@ -79,7 +113,7 @@
     } while (0)
 #define array_append(array, objs, len)                                         \
     do {                                                                       \
-        const ssize_t __len = (len);                                           \
+        const typeof((array).len) __len = (len);                               \
         array_ensure_capacity_delta(array, __len);                             \
         memcpy((array).data + (array).len, objs,                               \
                __len * sizeof(*(array).data));                                 \
@@ -87,9 +121,10 @@
     } while (0)
 #define array_ensure_capacity(array, goal)                                     \
     do {                                                                       \
+        array_ensure_can_edit(array);                                          \
         if ((array).size < (goal)) {                                           \
-            const ssize_t required_size = (goal);                              \
-            ssize_t next_size = (array).size;                                  \
+            const typeof((array).size) required_size = (goal);                 \
+            typeof((array).size) next_size = (array).size;                     \
             do {                                                               \
                 next_size = p_alloc_nr(next_size);                             \
             } while (next_size < required_size);                               \
@@ -99,22 +134,24 @@
 #define array_ensure_capacity_delta(array, delta)                              \
     array_ensure_capacity(array, (array).len + (delta))
 #define array_ensure_exact_capacity(array, goal)                               \
-    if (array_size(array) < (goal)) {                                          \
+    if ((array).size < (goal)) {                                               \
+        array_ensure_can_edit(array);                                          \
         p_allocgrow(&(array).data, (goal), &(array).size);                     \
     }
 #define array_adjust(array)                                                    \
     do {                                                                       \
+        array_ensure_can_edit(array);                                          \
         p_shrink(&(array).data, (array).len, &(array).size);                   \
     } while (0)
 #define array_elt(array, n) (array).data[(n)]
 #define array_ptr(array, n) (array).data + (n)
 
 #define foreach(var, array)                                                    \
-    for (int __Ai = 0 ; __Ai < (array).len ; ++__Ai) {                         \
+    for (uint32_t __Ai = 0 ; __Ai < (array).len ; ++__Ai) {                    \
         var = array_ptr(array, __Ai);
 
 #define array_foreach(array, action)                                           \
-    for (int __Ai = 0 ; __Ai < (array).len ; ++__Ai) {                         \
+    for (uint32_t __Ai = 0 ; __Ai < (array).len ; ++__Ai) {                    \
         action(array_ptr(array, __Ai));                                        \
     }
 #define array_deep_wipe(array, wipe)                                           \
@@ -123,13 +160,26 @@
         array_wipe(array);                                                     \
     } while (0)
 
+#define array_len(array) (array).len
+#define array_size(array) (array).size
+#define array_elt_len(array) sizeof(*(array).data)
+#define array_byte_len(array) ((array).len * array_elt_len(array))
+
 #define array_lock(array)                                                      \
-    !(mlock((array).data, (array).len * sizeof(*(array).data)) != 0)
+    ((array).locked                                                            \
+     || (mlock((array).data, array_byte_len(array)) == 0                       \
+         && ((array).locked = true)))
 #define array_unlock(array)                                                    \
-    (void)munlock((array).data, (array).len * sizeof(*(array).data))
+    if ((array).locked) {                                                      \
+        (void)munlock((array).data, array_byte_len(array));                    \
+        (array).locked = false;                                                \
+    }
 
 ARRAY(char)
 ARRAY(int)
+ARRAY(bool)
 ARRAY(uint32_t)
 
+PARRAY(void)
+
 #endif