projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove debug.
[apps/pfixtools.git]
/
common
/
array.h
diff --git
a/common/array.h
b/common/array.h
index
04a632b
..
b4dea94
100644
(file)
--- a/
common/array.h
+++ b/
common/array.h
@@
-38,6
+38,7
@@
#include "common.h"
#include "mem.h"
#include "common.h"
#include "mem.h"
+#include <sys/mman.h>
#define PRIV_ARRAY(Type) \
struct { \
#define PRIV_ARRAY(Type) \
struct { \
@@
-45,6
+46,22
@@
ssize_t len; \
ssize_t size; \
}
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; \
\
#define ARRAY(Type) \
typedef PRIV_ARRAY(Type) Type ## _array_t; \
\
@@
-59,8
+76,12
@@
array_wipe(**array); \
p_delete(array); \
} \
array_wipe(**array); \
p_delete(array); \
} \
- }
+ } \
+ \
+ PARRAY(Type)
+
#define A(Type) Type ## _array_t
#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 }
@@
-108,6
+129,10
@@
#define array_elt(array, n) (array).data[(n)]
#define array_ptr(array, n) (array).data + (n)
#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_foreach(array, action) \
for (int __Ai = 0 ; __Ai < (array).len ; ++__Ai) { \
action(array_ptr(array, __Ai)); \
@@
-118,7
+143,16
@@
array_wipe(array); \
} while (0)
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(char)
ARRAY(int)
+ARRAY(bool)
+ARRAY(uint32_t)
+
+PARRAY(void)
#endif
#endif