X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=common%2Farray.h;h=dadce33346bcf076d61306dcf0be97fcb5f12856;hb=c1d7275428570d953a7d138d364235242f1c0d34;hp=b85fc502d46838da861731ba91374605eeaf468c;hpb=d66ec885e2c3680b1b42e5cf99b18865c6c1736c;p=apps%2Fpfixtools.git

diff --git a/common/array.h b/common/array.h
index b85fc50..dadce33 100644
--- a/common/array.h
+++ b/common/array.h
@@ -38,6 +38,7 @@
 
 #include "common.h"
 #include "mem.h"
+#include <sys/mman.h>
 
 #define PRIV_ARRAY(Type)                                                       \
     struct {                                                                   \
@@ -45,6 +46,22 @@
         ssize_t len;                                                           \
         ssize_t size;                                                          \
     }
+
+#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) {                                                          \
+            array_wipe(**array);                                               \
+            p_delete(array);                                                   \
+        }                                                                      \
+    }
+
 #define ARRAY(Type)                                                            \
     typedef PRIV_ARRAY(Type) Type ## _array_t;                                 \
                                                                                \
@@ -59,7 +76,12 @@
             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 }
 
@@ -107,7 +129,30 @@
 #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) {                         \
+        var = array_ptr(array, __Ai);
+
+#define array_foreach(array, action)                                           \
+    for (int __Ai = 0 ; __Ai < (array).len ; ++__Ai) {                         \
+        action(array_ptr(array, __Ai));                                        \
+    }
+#define array_deep_wipe(array, wipe)                                           \
+    do {                                                                       \
+        array_foreach(array, wipe);                                            \
+        array_wipe(array);                                                     \
+    } while (0)
+
+#define array_lock(array)                                                      \
+    (mlock((array).data, (array).len * sizeof(*(array).data)) == 0)
+#define array_unlock(array)                                                    \
+    (void)munlock((array).data, (array).len * sizeof(*(array).data))
+
 ARRAY(char)
 ARRAY(int)
+ARRAY(bool)
+ARRAY(uint32_t)
+
+PARRAY(void)
 
 #endif