vector: Traversal, retrieval, insert and locking enhancements

Renamed AST_VECTOR_INSERT to AST_VECTOR_REPLACE because it really
does replace not insert.  The few users of AST_VECTOR_INSERT were
refactored.  Because these are macros, there should be no ABI
compatibility issues.

Added AST_VECTOR_INSERT_AT that actually inserts an element into the
vector at a specific index pushing existing elements to the right.

Added AST_VECTOR_GET_CMP that can retrieve from the vector based
on a user-provided compare function.

Added AST_VECTOR_CALLBACK function that will execute a function
for each element in the vector.  Similar to ao2_callback and
ao2_callback_data functions although the vector callback can take
a variable number of arguments.  This should allow easy migration
to a vector where a container might be too heavy.

Added read/write locked vector and lock manipulation macros.

Added unit tests.

ASTERISK-25045 #close

Change-Id: I2e07ecc709d2f5f91bcab8904e5e9340609b00e0
This commit is contained in:
George Joseph
2015-05-01 18:25:17 -06:00
parent 626bffc4c2
commit 7a7e9733c2
5 changed files with 649 additions and 19 deletions

View File

@@ -19,6 +19,8 @@
#ifndef _ASTERISK_VECTOR_H
#define _ASTERISK_VECTOR_H
#include "asterisk/lock.h"
/*! \file
*
* \brief Vector container support.
@@ -46,6 +48,20 @@
size_t current; \
}
/*!
* \brief Define a vector structure with a read/write lock
*
* \param name Optional vector struct name.
* \param type Vector element type.
*/
#define AST_VECTOR_RW(name, type) \
struct name { \
type *elems; \
size_t max; \
size_t current; \
ast_rwlock_t lock; \
}
/*!
* \brief Initialize a vector
*
@@ -71,6 +87,26 @@
(alloc_size == 0 || (vec)->elems != NULL) ? 0 : -1; \
})
/*!
* \brief Initialize a vector with a read/write lock
*
* If \a size is 0, then no space will be allocated until the vector is
* appended to.
*
* \param vec Vector to initialize.
* \param size Initial size of the vector.
*
* \return 0 on success.
* \return Non-zero on failure.
*/
#define AST_VECTOR_RW_INIT(vec, size) ({ \
int res = -1; \
if (AST_VECTOR_INIT(vec, size) == 0) { \
res = ast_rwlock_init(&(vec)->lock); \
} \
res; \
})
/*!
* \brief Deallocates this vector.
*
@@ -86,6 +122,19 @@
(vec)->current = 0; \
} while (0)
/*!
* \brief Deallocates this locked vector
*
* If any code to free the elements of this vector need to be run, that should
* be done prior to this call.
*
* \param vec Vector to deallocate.
*/
#define AST_VECTOR_RW_FREE(vec) do { \
AST_VECTOR_FREE(vec); \
ast_rwlock_destroy(&(vec)->lock); \
} while(0)
/*!
* \brief Append an element to a vector, growing the vector if needed.
*
@@ -116,11 +165,11 @@
})
/*!
* \brief Insert an element at a specific position in a vector, growing the vector if needed.
* \brief Replace an element at a specific position in a vector, growing the vector if needed.
*
* \param vec Vector to insert into.
* \param idx Position to insert at.
* \param elem Element to insert.
* \param vec Vector to replace into.
* \param idx Position to replace.
* \param elem Element to replace.
*
* \return 0 on success.
* \return Non-zero on failure.
@@ -131,7 +180,7 @@
* index means you can not use the UNORDERED assortment of macros. These macros alter the ordering
* of the vector itself.
*/
#define AST_VECTOR_INSERT(vec, idx, elem) ({ \
#define AST_VECTOR_REPLACE(vec, idx, elem) ({ \
int res = 0; \
do { \
if (((idx) + 1) > (vec)->max) { \
@@ -157,6 +206,46 @@
res; \
})
/*!
* \brief Insert an element at a specific position in a vector, growing the vector if needed.
*
* \param vec Vector to insert into.
* \param idx Position to insert at.
* \param elem Element to insert.
*
* \return 0 on success.
* \return Non-zero on failure.
*
* \warning This macro will shift existing elements right to make room for the new element.
*
* \warning Use of this macro with the expectation that the element will remain at the provided
* index means you can not use the UNORDERED assortment of macros. These macros alter the ordering
* of the vector itself.
*/
#define AST_VECTOR_INSERT_AT(vec, idx, elem) ({ \
int res = 0; \
size_t __move; \
do { \
if ((vec)->current + 1 > (vec)->max) { \
size_t new_max = (vec)->max ? 2 * (vec)->max : 1; \
typeof((vec)->elems) new_elems = ast_realloc( \
(vec)->elems, new_max * sizeof(*new_elems)); \
if (new_elems) { \
(vec)->elems = new_elems; \
(vec)->max = new_max; \
} else { \
res = -1; \
break; \
} \
} \
__move = ((vec)->current - 1) * sizeof(typeof((vec)->elems[0])); \
memmove(&(vec)->elems[(idx) + 1], &(vec)->elems[(idx)], __move); \
(vec)->elems[(idx)] = (elem); \
(vec)->current++; \
} while (0); \
res; \
})
/*!
* \brief Remove an element from a vector by index.
*
@@ -195,7 +284,6 @@
res; \
})
/*!
* \brief Remove an element from a vector that matches the given comparison
*
@@ -330,4 +418,118 @@
(vec)->elems[__idx]; \
})
/*!
* \brief Get an element from a vector that matches the given comparison
*
* \param vec Vector to get from.
* \param value Value to pass into comparator.
* \param cmp Comparator function/macros (called as \c cmp(elem, value))
*
* \return a pointer to the element that was found or NULL
*/
#define AST_VECTOR_GET_CMP(vec, value, cmp) ({ \
void *res = NULL; \
size_t idx; \
typeof(value) __value = (value); \
for (idx = 0; idx < (vec)->current; ++idx) { \
if (cmp((vec)->elems[idx], __value)) { \
res = &(vec)->elems[idx]; \
break; \
} \
} \
res; \
})
/*!
* \brief Execute a callback on every element in a vector
*
* \param vec Vector to operate on.
* \param callback A callback that takes at least 1 argument (the element)
* plus number of optional arguments
*
* \return the number of elements visited before the end of the vector
* was reached or CMP_STOP was returned.
*/
#define AST_VECTOR_CALLBACK(vec, callback, ...) ({ \
size_t idx; \
for (idx = 0; idx < (vec)->current; idx++) { \
int rc = callback((vec)->elems[idx], ##__VA_ARGS__); \
if (rc == CMP_STOP) { \
idx++; \
break; \
}\
} \
idx; \
})
/*!
* \brief Obtain read lock on vector
*
* \param vec Vector to operate on.
*
* \return 0 if success
* \return Non-zero if error
*/
#define AST_VECTOR_RW_RDLOCK(vec) ast_rwlock_rdlock(&(vec)->lock)
/*!
* \brief Obtain write lock on vector
*
* \param vec Vector to operate on.
*
* \return 0 if success
* \return Non-zero if error
*/
#define AST_VECTOR_RW_WRLOCK(vec) ast_rwlock_wrlock(&(vec)->lock)
/*!
* \brief Unlock vector
*
* \param vec Vector to operate on.
*
* \return 0 if success
* \return Non-zero if error
*/
#define AST_VECTOR_RW_UNLOCK(vec) ast_rwlock_unlock(&(vec)->lock)
/*!
* \brief Try to obtain read lock on vector failing immediately if unable
*
* \param vec Vector to operate on.
*
* \return 0 if success
* \return Non-zero if error
*/
#define AST_VECTOR_RW_RDLOCK_TRY(vec) ast_rwlock_tryrdlock(&(vec)->lock)
/*!
* \brief Try to obtain write lock on vector failing immediately if unable
*
* \param vec Vector to operate on.
*
* \return 0 if success
* \return Non-zero if error
*/
#define AST_VECTOR_RW_WRLOCK_TRY(vec) ast_rwlock_trywrlock(&(vec)->lock)
/*!
* \brief Try to obtain read lock on vector failing after timeout if unable
*
* \param vec Vector to operate on.
*
* \return 0 if success
* \return Non-zero if error
*/
#define AST_VECTOR_RW_RDLOCK_TIMED(vec, timespec) ast_rwlock_timedrdlock(&(vec)->lock, timespec)
/*!
* \brief Try to obtain write lock on vector failing after timeout if unable
*
* \param vec Vector to operate on.
*
* \return 0 if success
* \return Non-zero if error
*/
#define AST_VECTOR_RW_WRLOCK_TIMED(vec, timespec) ast_rwlock_timedwrlock(&(vec)->lock, timespec)
#endif /* _ASTERISK_VECTOR_H */