Changeset df29f24 in mainline for uspace/lib/c/include/adt/list.h

Timestamp:

2011-06-01T09:04:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:

• uspace/lib/c/include/adt/list.h (modified) (6 diffs)

uspace/lib/c/include/adt/list.h

@@ -49 +49 @@
  *
  */
-#define LIST_INITIALIZE(name)  link_t name = { \
-        .prev = &name, \
-        .next = &name \
-}
+#define LIST_INITIALIZE(name) \
+        link_t name = { \
+                .prev = &name, \
+                .next = &name \
+        }
+
+#define list_get_instance(link, type, member) \
+        ((type *) (((void *)(link)) - ((void *) &(((type *) NULL)->member))))
+
+#define list_foreach(list, iterator) \
+        for (link_t *iterator = (list).next; \
+            iterator != &(list); iterator = iterator->next)
 
 /** Initialize doubly-linked circular list link
@@ -71 +79 @@
  * Initialize doubly-linked circular list.
  *
- * @param head Pointer to link_t structure representing head of the list.
- *
- */
-static inline void list_initialize(link_t *head)
-{
-        head->prev = head;
-        head->next = head;
+ * @param list Pointer to link_t structure representing the list.
+ *
+ */
+static inline void list_initialize(link_t *list)
+{
+        list->prev = list;
+        list->next = list;
 }
 
@@ -85 +93 @@
  *
  * @param link Pointer to link_t structure to be added.
- * @param head Pointer to link_t structure representing head of the list.
- *
- */
-static inline void list_prepend(link_t *link, link_t *head)
-{
-        link->next = head->next;
-        link->prev = head;
-        head->next->prev = link;
-        head->next = link;
+ * @param list Pointer to link_t structure representing the list.
+ *
+ */
+static inline void list_prepend(link_t *link, link_t *list)
+{
+        link->next = list->next;
+        link->prev = list;
+        list->next->prev = link;
+        list->next = link;
 }
 
@@ -101 +109 @@
  *
  * @param link Pointer to link_t structure to be added.
- * @param head Pointer to link_t structure representing head of the list.
- *
- */
-static inline void list_append(link_t *link, link_t *head)
-{
-        link->prev = head->prev;
-        link->next = head;
-        head->prev->next = link;
-        head->prev = link;
-}
-
-/** Insert item before another item in doubly-linked circular list. */
-static inline void list_insert_before(link_t *l, link_t *r)
-{
-        list_append(l, r);
-}
-
-/** Insert item after another item in doubly-linked circular list. */
-static inline void list_insert_after(link_t *r, link_t *l)
-{
-        list_prepend(l, r);
+ * @param list Pointer to link_t structure representing the list.
+ *
+ */
+static inline void list_append(link_t *link, link_t *list)
+{
+        link->prev = list->prev;
+        link->next = list;
+        list->prev->next = link;
+        list->prev = link;
+}
+
+/** Insert item before another item in doubly-linked circular list.
+ *
+ */
+static inline void list_insert_before(link_t *link, link_t *list)
+{
+        list_append(link, list);
+}
+
+/** Insert item after another item in doubly-linked circular list.
+ *
+ */
+static inline void list_insert_after(link_t *link, link_t *list)
+{
+        list_prepend(list, link);
 }
 
@@ -143 +155 @@
  * Query emptiness of doubly-linked circular list.
  *
- * @param head Pointer to link_t structure representing head of the list.
- *
- */
-static inline int list_empty(link_t *head)
-{
-        return ((head->next == head) ? 1 : 0);
+ * @param list Pointer to link_t structure representing the list.
+ *
+ */
+static inline int list_empty(link_t *list)
+{
+        return (list->next == list);
+}
+
+/** Get head item of a list.
+ *
+ * @param list Pointer to link_t structure representing the list.
+ *
+ * @return Head item of the list.
+ * @return NULL if the list is empty.
+ *
+ */
+static inline link_t *list_head(link_t *list)
+{
+        return ((list->next == list) ? NULL : list->next);
 }
 
@@ -205 +230 @@
 }
 
-#define list_get_instance(link, type, member) \
-        ((type *) (((void *)(link)) - ((void *) &(((type *) NULL)->member))))
-
-#define list_foreach(list, iterator) \
-        for (link_t *iterator = (list).next; \
-            iterator != &(list); iterator = iterator->next)
+/** Get n-th item of a list.
+ *
+ * @param list Pointer to link_t structure representing the list.
+ * @param n    Item number (indexed from zero).
+ *
+ * @return n-th item of the list.
+ * @return NULL if no n-th item found.
+ *
+ */
+static inline link_t *list_nth(link_t *list, unsigned int n)
+{
+        unsigned int cnt = 0;
+        
+        list_foreach(*list, link) {
+                if (cnt == n)
+                        return link;
+                
+                cnt++;
+        }
+        
+        return NULL;
+}
 
 extern int list_member(const link_t *, const link_t *);