![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/utils/llist.c b/src/utils/llist.c
index 765743f3906d593e63f28044926d877e3d6b3dc2..f9bf722785dab30087c2c6e796858f3decd3f4a7 100644 (file)
--- a/src/utils/llist.c
+++ b/src/utils/llist.c
/*
- * syscollector - src/utils/llist.c
+ * SysDB - src/utils/llist.c
* Copyright (C) 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
* All rights reserved.
*
* 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>
* private data types
*/
-struct sc_llist_elem;
-typedef struct sc_llist_elem sc_llist_elem_t;
+struct sdb_llist_elem;
+typedef struct sdb_llist_elem sdb_llist_elem_t;
-struct sc_llist_elem {
- sc_object_t *obj;
+struct sdb_llist_elem {
+ sdb_object_t *obj;
- sc_llist_elem_t *next;
- sc_llist_elem_t *prev;
+ sdb_llist_elem_t *next;
+ sdb_llist_elem_t *prev;
};
-struct sc_llist {
+struct sdb_llist {
pthread_rwlock_t lock;
- sc_llist_elem_t *head;
- sc_llist_elem_t *tail;
+ sdb_llist_elem_t *head;
+ sdb_llist_elem_t *tail;
size_t length;
};
-struct sc_llist_iter {
- sc_llist_t *list;
- sc_llist_elem_t *elem;
+struct sdb_llist_iter {
+ sdb_llist_t *list;
+ sdb_llist_elem_t *elem;
};
/*
* private helper functions
*/
+static void
+llist_clear(sdb_llist_t *list)
+{
+ sdb_llist_elem_t *elem;
+
+ assert(list);
+ elem = list->head;
+ while (elem) {
+ sdb_llist_elem_t *tmp = elem->next;
+
+ sdb_object_deref(elem->obj);
+ free(elem);
+
+ elem = tmp;
+ }
+
+ list->head = list->tail = NULL;
+ list->length = 0;
+} /* llist_clear */
+
/* Insert a new element after 'elem'. If 'elem' is NULL, insert at the head of
* the list. */
static int
-sc_llist_insert_after(sc_llist_t *list, sc_llist_elem_t *elem,
- sc_object_t *obj)
+llist_insert_after(sdb_llist_t *list, sdb_llist_elem_t *elem,
+ sdb_object_t *obj)
{
- sc_llist_elem_t *new;
+ sdb_llist_elem_t *new;
assert(list);
assert(list->head == list->tail);
}
- sc_object_ref(obj);
+ sdb_object_ref(obj);
++list->length;
return 0;
-} /* sc_llist_insert_after */
+} /* 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 sc_object_t *
-sc_llist_remove_elem(sc_llist_t *list, sc_llist_elem_t *elem)
+static sdb_object_t *
+llist_remove_elem(sdb_llist_t *list, sdb_llist_elem_t *elem)
{
- sc_object_t *obj;
+ sdb_object_t *obj;
assert(list && elem);
--list->length;
return obj;
-} /* sc_llist_remove_elem */
+} /* llist_remove_elem */
/*
* public API
*/
-sc_llist_t *
-sc_llist_create(void)
+sdb_llist_t *
+sdb_llist_create(void)
{
- sc_llist_t *list;
+ sdb_llist_t *list;
list = malloc(sizeof(*list));
if (! list)
list->head = list->tail = NULL;
list->length = 0;
return list;
-} /* sc_llist_create */
+} /* sdb_llist_create */
-sc_llist_t *
-sc_llist_clone(sc_llist_t *list)
+sdb_llist_t *
+sdb_llist_clone(sdb_llist_t *list)
{
- sc_llist_t *clone;
- sc_llist_elem_t *elem;
+ sdb_llist_t *new;
+ sdb_llist_elem_t *elem;
if (! list)
return NULL;
- clone = sc_llist_create();
- if (! clone)
+ new = sdb_llist_create();
+ if (! new)
return NULL;
if (! list->length) {
assert((! list->head) && (! list->tail));
- return clone;
+ return new;
}
for (elem = list->head; elem; elem = elem->next) {
- if (sc_llist_append(clone, elem->obj)) {
- sc_llist_destroy(clone);
+ if (sdb_llist_append(new, elem->obj)) {
+ sdb_llist_destroy(new);
return NULL;
}
}
- return clone;
-} /* sc_llist_clone */
+ return new;
+} /* sdb_llist_clone */
void
-sc_llist_destroy(sc_llist_t *list)
+sdb_llist_destroy(sdb_llist_t *list)
{
- sc_llist_elem_t *elem;
-
if (! list)
return;
pthread_rwlock_wrlock(&list->lock);
-
- elem = list->head;
- while (elem) {
- sc_llist_elem_t *tmp = elem->next;
-
- sc_object_deref(elem->obj);
- free(elem);
-
- elem = tmp;
- }
-
- list->head = list->tail = NULL;
- list->length = 0;
-
+ llist_clear(list);
pthread_rwlock_unlock(&list->lock);
pthread_rwlock_destroy(&list->lock);
free(list);
-} /* sc_llist_destroy */
+} /* sdb_llist_destroy */
+
+void
+sdb_llist_clear(sdb_llist_t *list)
+{
+ if (! list)
+ return;
+
+ pthread_rwlock_wrlock(&list->lock);
+ llist_clear(list);
+ pthread_rwlock_unlock(&list->lock);
+} /* sdb_llist_clear */
int
-sc_llist_append(sc_llist_t *list, sc_object_t *obj)
+sdb_llist_append(sdb_llist_t *list, sdb_object_t *obj)
{
int status;
return -1;
pthread_rwlock_wrlock(&list->lock);
- status = sc_llist_insert_after(list, list->tail, obj);
+ status = llist_insert_after(list, list->tail, obj);
pthread_rwlock_unlock(&list->lock);
return status;
-} /* sc_llist_append */
+} /* sdb_llist_append */
int
-sc_llist_insert(sc_llist_t *list, sc_object_t *obj, size_t index)
+sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t idx)
{
- sc_llist_elem_t *prev;
- sc_llist_elem_t *next;
+ sdb_llist_elem_t *prev;
+ sdb_llist_elem_t *next;
int status;
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;
}
- status = sc_llist_insert_after(list, prev, obj);
+ status = llist_insert_after(list, prev, obj);
pthread_rwlock_unlock(&list->lock);
return status;
-} /* sc_llist_insert */
+} /* sdb_llist_insert */
int
-sc_llist_insert_sorted(sc_llist_t *list, sc_object_t *obj,
- int (*compare)(const sc_object_t *, const sc_object_t *))
+sdb_llist_insert_sorted(sdb_llist_t *list,
+ sdb_object_t *obj, sdb_llist_cmp_cb compare)
{
- sc_llist_elem_t *prev;
- sc_llist_elem_t *next;
+ sdb_llist_elem_t *prev;
+ sdb_llist_elem_t *next;
int status;
prev = next;
next = next->next;
}
- status = sc_llist_insert_after(list, prev, obj);
+ status = llist_insert_after(list, prev, obj);
pthread_rwlock_unlock(&list->lock);
return status;
-} /* sc_llist_insert_sorted */
+} /* sdb_llist_insert_sorted */
-sc_object_t *
-sc_llist_search(sc_llist_t *list, const sc_object_t *key,
- int (*compare)(const sc_object_t *, const sc_object_t *))
+sdb_object_t *
+sdb_llist_get(sdb_llist_t *list, size_t i)
{
- sc_llist_elem_t *elem;
+ sdb_llist_elem_t *elem;
+ size_t j;
- if ((! list) || (! compare))
+ 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) || (! 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;
-} /* sc_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 = llist_remove_elem(list, elem);
+ pthread_rwlock_unlock(&list->lock);
+
+ return obj;
+} /* sdb_llist_remove */
+
+sdb_object_t *
+sdb_llist_remove_by_name(sdb_llist_t *list, const char *key)
+{
+ sdb_llist_elem_t *elem;
+ sdb_object_t *obj = NULL;
+
+ if (! list)
+ return NULL;
+
+ pthread_rwlock_rdlock(&list->lock);
+
+ for (elem = list->head; elem; elem = elem->next)
+ if ((key == elem->obj->name)
+ || (! strcasecmp(elem->obj->name, key)))
+ break;
+
+ if (elem)
+ obj = llist_remove_elem(list, elem);
+ pthread_rwlock_unlock(&list->lock);
+
+ return obj;
+} /* sdb_llist_remove_by_name */
-sc_object_t *
-sc_llist_shift(sc_llist_t *list)
+sdb_object_t *
+sdb_llist_shift(sdb_llist_t *list)
{
- sc_object_t *obj;
+ sdb_object_t *obj;
if ((! list) || (! list->head))
return NULL;
pthread_rwlock_wrlock(&list->lock);
- obj = sc_llist_remove_elem(list, list->head);
+ obj = llist_remove_elem(list, list->head);
pthread_rwlock_unlock(&list->lock);
return obj;
-} /* sc_llist_shift */
+} /* sdb_llist_shift */
-sc_llist_iter_t *
-sc_llist_get_iter(sc_llist_t *list)
+sdb_llist_iter_t *
+sdb_llist_get_iter(sdb_llist_t *list)
{
- sc_llist_iter_t *iter;
+ sdb_llist_iter_t *iter;
if (! list)
return NULL;
/* XXX: keep lock until destroying the iterator? */
pthread_rwlock_unlock(&list->lock);
return iter;
-} /* sc_llist_get_iter */
+} /* sdb_llist_get_iter */
void
-sc_llist_iter_destroy(sc_llist_iter_t *iter)
+sdb_llist_iter_destroy(sdb_llist_iter_t *iter)
{
if (! iter)
return;
iter->list = NULL;
iter->elem = NULL;
free(iter);
-} /* sc_llist_iter_destroy */
+} /* sdb_llist_iter_destroy */
_Bool
-sc_llist_iter_has_next(sc_llist_iter_t *iter)
+sdb_llist_iter_has_next(sdb_llist_iter_t *iter)
{
if (! iter)
return 0;
return iter->elem != NULL;
-} /* sc_llist_iter_has_next */
+} /* sdb_llist_iter_has_next */
-sc_object_t *
-sc_llist_iter_get_next(sc_llist_iter_t *iter)
+sdb_object_t *
+sdb_llist_iter_get_next(sdb_llist_iter_t *iter)
{
- sc_object_t *obj;
+ sdb_object_t *obj;
if ((! iter) || (! iter->elem))
return NULL;
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;
pthread_rwlock_unlock(&iter->list->lock);
return obj;
-} /* sc_llist_iter_get_next */
+} /* 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)
+ 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 : */