![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/utils/llist.c b/src/utils/llist.c
index 64f7d0c1bd9d4ba096d4878f9e64c198cfbff4f8..f9bf722785dab30087c2c6e796858f3decd3f4a7 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>
* 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
-sdb_llist_insert_after(sdb_llist_t *list, sdb_llist_elem_t *elem,
+llist_insert_after(sdb_llist_t *list, sdb_llist_elem_t *elem,
sdb_object_t *obj)
{
sdb_llist_elem_t *new;
sdb_object_ref(obj);
++list->length;
return 0;
-} /* sdb_llist_insert_after */
+} /* llist_insert_after */
static sdb_llist_elem_t *
llist_search(sdb_llist_t *list,
} /* llist_search */
static sdb_object_t *
-sdb_llist_remove_elem(sdb_llist_t *list, sdb_llist_elem_t *elem)
+llist_remove_elem(sdb_llist_t *list, sdb_llist_elem_t *elem)
{
sdb_object_t *obj;
--list->length;
return obj;
-} /* sdb_llist_remove_elem */
+} /* llist_remove_elem */
/*
* public API
void
sdb_llist_destroy(sdb_llist_t *list)
{
- sdb_llist_elem_t *elem;
-
if (! list)
return;
pthread_rwlock_wrlock(&list->lock);
-
- 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(list);
pthread_rwlock_unlock(&list->lock);
pthread_rwlock_destroy(&list->lock);
free(list);
} /* 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
sdb_llist_append(sdb_llist_t *list, sdb_object_t *obj)
{
return -1;
pthread_rwlock_wrlock(&list->lock);
- status = sdb_llist_insert_after(list, list->tail, obj);
+ status = llist_insert_after(list, list->tail, obj);
pthread_rwlock_unlock(&list->lock);
return status;
} /* sdb_llist_append */
prev = next;
next = next->next;
}
- status = sdb_llist_insert_after(list, prev, obj);
+ status = llist_insert_after(list, prev, obj);
pthread_rwlock_unlock(&list->lock);
return status;
} /* sdb_llist_insert */
prev = next;
next = next->next;
}
- status = sdb_llist_insert_after(list, prev, obj);
+ status = llist_insert_after(list, prev, obj);
pthread_rwlock_unlock(&list->lock);
return status;
} /* sdb_llist_insert_sorted */
+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)
pthread_rwlock_wrlock(&list->lock);
elem = llist_search(list, lookup, user_data);
if (elem)
- obj = sdb_llist_remove_elem(list, 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 */
+
sdb_object_t *
sdb_llist_shift(sdb_llist_t *list)
{
return NULL;
pthread_rwlock_wrlock(&list->lock);
- obj = sdb_llist_remove_elem(list, list->head);
+ obj = llist_remove_elem(list, list->head);
pthread_rwlock_unlock(&list->lock);
return obj;
} /* sdb_llist_shift */
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;
else
elem = iter->elem->prev;
if (elem)
- sdb_llist_remove_elem(iter->list, elem);
+ llist_remove_elem(iter->list, elem);
pthread_rwlock_unlock(&iter->list->lock);