X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Flist.h;h=04dad80929ef1d6f2ec1a3adcd302d8f2f962533;hb=1f689e13ea7e519b1afc001e9c55a7b1b60b599f;hp=b872713fdb7dfcdce01923a3545444dafb4e7e7b;hpb=16aa9ee87cf4364921c36025359be01390338d87;p=urcu.git diff --git a/urcu/list.h b/urcu/list.h index b872713..04dad80 100644 --- a/urcu/list.h +++ b/urcu/list.h @@ -1,24 +1,29 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 2002. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ +/* + * Copyright (C) 2002 Free Software Foundation, Inc. + * (originally part of the GNU C Library) + * Contributed by Ulrich Drepper , 2002. + * + * Copyright (C) 2009 Pierre-Marc Fournier + * Conversion to RCU list. + * Copyright (C) 2010 Mathieu Desnoyers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ -#ifndef _LIST_H -#define _LIST_H 1 +#ifndef _CDS_LIST_H +#define _CDS_LIST_H 1 /* The definitions of this file are adopted from those which can be found in the Linux kernel headers to enable people familiar with @@ -26,16 +31,16 @@ /* Basic type for the double-link list. */ -typedef struct cds_list_head +struct cds_list_head { struct cds_list_head *next; struct cds_list_head *prev; -} list_t; +}; /* Define a variable with the head and tail of the list. */ #define CDS_LIST_HEAD(name) \ - list_t name = { &(name), &(name) } + struct cds_list_head name = { &(name), &(name) } /* Initialize a new list head. */ #define CDS_INIT_LIST_HEAD(ptr) \ @@ -45,7 +50,7 @@ typedef struct cds_list_head /* Add new element at the head of the list. */ static inline void -cds_list_add (list_t *newp, list_t *head) +cds_list_add (struct cds_list_head *newp, struct cds_list_head *head) { head->next->prev = newp; newp->next = head->next; @@ -56,7 +61,7 @@ cds_list_add (list_t *newp, list_t *head) /* Add new element at the tail of the list. */ static inline void -cds_list_add_tail (list_t *newp, list_t *head) +cds_list_add_tail (struct cds_list_head *newp, struct cds_list_head *head) { head->prev->next = newp; newp->next = head; @@ -67,7 +72,7 @@ cds_list_add_tail (list_t *newp, list_t *head) /* Remove element from list. */ static inline void -__cds_list_del (list_t *prev, list_t *next) +__cds_list_del (struct cds_list_head *prev, struct cds_list_head *next) { next->prev = prev; prev->next = next; @@ -75,14 +80,22 @@ __cds_list_del (list_t *prev, list_t *next) /* Remove element from list. */ static inline void -cds_list_del (list_t *elem) +cds_list_del (struct cds_list_head *elem) { __cds_list_del (elem->prev, elem->next); } +/* Remove element from list, initializing the element's list pointers. */ +static inline void +cds_list_del_init (struct cds_list_head *elem) +{ + cds_list_del(elem); + CDS_INIT_LIST_HEAD(elem); +} + /* delete from list, add to another list as head */ static inline void -cds_list_move (list_t *elem, list_t *head) +cds_list_move (struct cds_list_head *elem, struct cds_list_head *head) { __cds_list_del (elem->prev, elem->next); cds_list_add (elem, head); @@ -91,7 +104,7 @@ cds_list_move (list_t *elem, list_t *head) /* replace an old entry. */ static inline void -cds_list_replace(list_t *old, list_t *_new) +cds_list_replace(struct cds_list_head *old, struct cds_list_head *_new) { _new->next = old->next; _new->prev = old->prev; @@ -101,7 +114,7 @@ cds_list_replace(list_t *old, list_t *_new) /* Join two lists. */ static inline void -cds_list_splice (list_t *add, list_t *head) +cds_list_splice (struct cds_list_head *add, struct cds_list_head *head) { /* Do nothing if the list which gets added is empty. */ if (add != add->next) @@ -113,12 +126,15 @@ cds_list_splice (list_t *add, list_t *head) } } - /* Get typed element from list at a given position. */ #define cds_list_entry(ptr, type, member) \ ((type *) ((char *) (ptr) - (unsigned long) (&((type *) 0)->member))) +/* Get first entry from a list. */ +#define cds_list_first_entry(ptr, type, member) \ + cds_list_entry((ptr)->next, type, member) + /* Iterate forward over the elements of the list. */ #define cds_list_for_each(pos, head) \ @@ -153,18 +169,18 @@ cds_list_splice (list_t *add, list_t *head) &pos->member != (head); \ pos = p, p = cds_list_entry(pos->member.next, typeof(*pos), member)) -static inline int cds_list_empty(list_t *head) +static inline int cds_list_empty(struct cds_list_head *head) { return head == head->next; } -static inline void cds_list_replace_init(list_t *old, - list_t *_new) +static inline void cds_list_replace_init(struct cds_list_head *old, + struct cds_list_head *_new) { - list_t *head = old->next; + struct cds_list_head *head = old->next; cds_list_del(old); cds_list_add_tail(_new, head); CDS_INIT_LIST_HEAD(old); } -#endif /* list.h */ +#endif /* _CDS_LIST_H */