X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Futils%2Fllist.c;h=f9bf722785dab30087c2c6e796858f3decd3f4a7;hp=7d573cfa7449ca1dba229e18702fbac009d688c5;hb=56b97a180a53aecbfe9f7162b8ece3faae973cf9;hpb=7ff716de0679a2bfab0086e575c4a3c1b1642ff4 diff --git a/src/utils/llist.c b/src/utils/llist.c index 7d573cf..f9bf722 100644 --- a/src/utils/llist.c +++ b/src/utils/llist.c @@ -25,10 +25,15 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#if HAVE_CONFIG_H +# include "config.h" +#endif /* HAVE_CONFIG_H */ + #include "utils/llist.h" #include #include +#include #include @@ -64,10 +69,30 @@ struct sdb_llist_iter { * 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; @@ -112,10 +137,24 @@ sdb_llist_insert_after(sdb_llist_t *list, sdb_llist_elem_t *elem, 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, + 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) +llist_remove_elem(sdb_llist_t *list, sdb_llist_elem_t *elem) { sdb_object_t *obj; @@ -142,7 +181,7 @@ sdb_llist_remove_elem(sdb_llist_t *list, sdb_llist_elem_t *elem) --list->length; return obj; -} /* sdb_llist_remove_elem */ +} /* llist_remove_elem */ /* * public API @@ -194,31 +233,27 @@ sdb_llist_clone(sdb_llist_t *list) 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) { @@ -228,13 +263,13 @@ 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 */ 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; @@ -243,7 +278,7 @@ sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t index) size_t i; - if ((! list) || (! obj) || (index > list->length)) + if ((! list) || (! obj) || (idx > list->length)) return -1; pthread_rwlock_wrlock(&list->lock); @@ -251,18 +286,18 @@ sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t index) prev = NULL; next = list->head; - for (i = 0; i < index; ++i) { + for (i = 0; i < idx; ++i) { 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 */ 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; @@ -284,24 +319,58 @@ sdb_llist_insert_sorted(sdb_llist_t *list, sdb_object_t *obj, 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_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) || (! 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) || (! compare)) + 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); @@ -309,7 +378,49 @@ sdb_llist_search(sdb_llist_t *list, const sdb_object_t *key, 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 = 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) @@ -320,7 +431,7 @@ 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 */ @@ -376,6 +487,11 @@ sdb_llist_iter_get_next(sdb_llist_iter_t *iter) 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; @@ -383,5 +499,37 @@ sdb_llist_iter_get_next(sdb_llist_iter_t *iter) 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) + 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 : */