diff --git a/src/utils/llist.c b/src/utils/llist.c
index 7d573cfa7449ca1dba229e18702fbac009d688c5..f009bcdac43cd30b3ccd51c0d79f953018f16e04 100644 (file)
--- a/src/utils/llist.c
+++ b/src/utils/llist.c
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include "utils/llist.h"
#include <assert.h>
#include <stdlib.h>
+#include <strings.h>
#include <pthread.h>
return 0;
} /* sdb_llist_insert_after */
+static sdb_llist_elem_t *
+llist_search(sdb_llist_t *list,
+ sdb_llist_lookup_cb lookup, const void *user_data)
+{
+ sdb_llist_elem_t *elem;
+
+ assert(list && lookup);
+
+ for (elem = list->head; elem; elem = elem->next)
+ if (! lookup(elem->obj, user_data))
+ break;
+ return elem;
+} /* llist_search */
+
static sdb_object_t *
sdb_llist_remove_elem(sdb_llist_t *list, sdb_llist_elem_t *elem)
{
} /* sdb_llist_append */
int
-sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t index)
+sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t idx)
{
sdb_llist_elem_t *prev;
sdb_llist_elem_t *next;
size_t i;
- if ((! list) || (! obj) || (index > list->length))
+ if ((! list) || (! obj) || (idx > list->length))
return -1;
pthread_rwlock_wrlock(&list->lock);
prev = NULL;
next = list->head;
- for (i = 0; i < index; ++i) {
+ for (i = 0; i < idx; ++i) {
prev = next;
next = next->next;
}
} /* sdb_llist_insert */
int
-sdb_llist_insert_sorted(sdb_llist_t *list, sdb_object_t *obj,
- int (*compare)(const sdb_object_t *, const sdb_object_t *))
+sdb_llist_insert_sorted(sdb_llist_t *list,
+ sdb_object_t *obj, sdb_llist_cmp_cb compare)
{
sdb_llist_elem_t *prev;
sdb_llist_elem_t *next;
} /* sdb_llist_insert_sorted */
sdb_object_t *
-sdb_llist_search(sdb_llist_t *list, const sdb_object_t *key,
- int (*compare)(const sdb_object_t *, const sdb_object_t *))
+sdb_llist_get(sdb_llist_t *list, size_t i)
+{
+ sdb_llist_elem_t *elem;
+ size_t j;
+
+ if ((! list) || (i >= list->length))
+ return NULL;
+
+ for (elem = list->head, j = 0; j < i; elem = elem->next, ++j)
+ /* iterate */;
+
+ assert(elem);
+ sdb_object_ref(elem->obj);
+ return elem->obj;
+} /* sdb_llist_get */
+
+sdb_object_t *
+sdb_llist_search(sdb_llist_t *list,
+ sdb_llist_lookup_cb lookup, const void *user_data)
{
sdb_llist_elem_t *elem;
- if ((! list) || (! compare))
+ if ((! list) || (! lookup))
+ return NULL;
+
+ pthread_rwlock_rdlock(&list->lock);
+ elem = llist_search(list, lookup, user_data);
+ pthread_rwlock_unlock(&list->lock);
+
+ if (elem)
+ return elem->obj;
+ return NULL;
+} /* sdb_llist_search */
+
+sdb_object_t *
+sdb_llist_search_by_name(sdb_llist_t *list, const char *key)
+{
+ sdb_llist_elem_t *elem;
+
+ if (! list)
return NULL;
pthread_rwlock_rdlock(&list->lock);
for (elem = list->head; elem; elem = elem->next)
- if (! compare(elem->obj, key))
+ if (! strcasecmp(elem->obj->name, key))
break;
pthread_rwlock_unlock(&list->lock);
if (elem)
return elem->obj;
return NULL;
-} /* sdb_llist_search */
+} /* sdb_llist_search_by_name */
+
+sdb_object_t *
+sdb_llist_remove(sdb_llist_t *list,
+ sdb_llist_lookup_cb lookup, const void *user_data)
+{
+ sdb_llist_elem_t *elem;
+ sdb_object_t *obj = NULL;
+
+ if ((! list) || (! lookup))
+ return NULL;
+
+ pthread_rwlock_wrlock(&list->lock);
+ elem = llist_search(list, lookup, user_data);
+ if (elem)
+ obj = sdb_llist_remove_elem(list, elem);
+ pthread_rwlock_unlock(&list->lock);
+
+ return obj;
+} /* sdb_llist_remove */
sdb_object_t *
sdb_llist_shift(sdb_llist_t *list)
pthread_rwlock_rdlock(&iter->list->lock);
+ /* XXX: increment ref-cnt for this object?
+ * also: when letting an element take ownership of next and prev
+ * elements, this might be a fairly cheap way to implement a weak
+ * type of snapshotting */
+
obj = iter->elem->obj;
iter->elem = iter->elem->next;
return obj;
} /* sdb_llist_iter_get_next */
+int
+sdb_llist_iter_remove_current(sdb_llist_iter_t *iter)
+{
+ sdb_llist_elem_t *elem;
+
+ if ((! iter) || (! iter->list))
+ return -1;
+
+ pthread_rwlock_wrlock(&iter->list->lock);
+
+ if (! iter->elem) /* reached end of list */
+ elem = iter->list->tail;
+ else
+ elem = iter->elem->prev;
+ if (elem)
+ sdb_llist_remove_elem(iter->list, elem);
+
+ pthread_rwlock_unlock(&iter->list->lock);
+
+ if (! elem)
+ return -1;
+ return 0;
+} /* sdb_llist_iter_remove */
+
+size_t
+sdb_llist_len(sdb_llist_t *list)
+{
+ if (! list)
+ return 0;
+ return list->length;
+} /* sdb_llist_len */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */