Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Sep 2012 21:03:49 +0000 (UTC)
From:      Ed Schouten <ed@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r240422 - in head: share/man/man3 sys/sys
Message-ID:  <201209122103.q8CL3nJT047718@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ed
Date: Wed Sep 12 21:03:48 2012
New Revision: 240422
URL: http://svn.freebsd.org/changeset/base/240422

Log:
  Implement LIST_PREV().
  
  Regular LISTs have been implemented in such a way that the prev-pointer
  does not point to the previous element, but to the next-pointer stored
  in the previous element. This is done to simplify LIST_REMOVE(). This
  macro can be implemented without knowing the address of the list head.
  
  Unfortunately this makes it harder to implement LIST_PREV(), which is
  why this macro was never here. Still, it is possible to implement this
  macro. If the prev-pointer points to the list head, we return NULL.
  Otherwise we simply subtract the offset of the prev-pointer within the
  structure.
  
  It's not as efficient as traversing forward of course, but in practice
  it shouldn't be that bad. In almost all use cases, people will want to
  compare the value returned by LIST_PREV() against NULL, so an optimizing
  compiler will not emit code that does more branching than TAILQs.
  
  While there, make the code a bit more readable by introducing
  __member2struct(). This makes STAILQ_LAST() far more readable.
  
  MFC after:	1 month

Modified:
  head/share/man/man3/Makefile
  head/share/man/man3/queue.3
  head/sys/sys/cdefs.h
  head/sys/sys/param.h
  head/sys/sys/queue.h

Modified: head/share/man/man3/Makefile
==============================================================================
--- head/share/man/man3/Makefile	Wed Sep 12 21:00:37 2012	(r240421)
+++ head/share/man/man3/Makefile	Wed Sep 12 21:03:48 2012	(r240422)
@@ -76,6 +76,7 @@ MLINKS+=	queue.3 LIST_EMPTY.3 \
 		queue.3 LIST_INSERT_BEFORE.3 \
 		queue.3 LIST_INSERT_HEAD.3 \
 		queue.3 LIST_NEXT.3 \
+		queue.3 LIST_PREV.3 \
 		queue.3 LIST_REMOVE.3 \
 		queue.3 LIST_SWAP.3 \
 		queue.3 SLIST_EMPTY.3 \

Modified: head/share/man/man3/queue.3
==============================================================================
--- head/share/man/man3/queue.3	Wed Sep 12 21:00:37 2012	(r240421)
+++ head/share/man/man3/queue.3	Wed Sep 12 21:03:48 2012	(r240422)
@@ -32,7 +32,7 @@
 .\"	@(#)queue.3	8.2 (Berkeley) 1/24/94
 .\" $FreeBSD$
 .\"
-.Dd May 13, 2011
+.Dd Sep 12, 2012
 .Dt QUEUE 3
 .Os
 .Sh NAME
@@ -81,6 +81,7 @@
 .Nm LIST_INSERT_BEFORE ,
 .Nm LIST_INSERT_HEAD ,
 .Nm LIST_NEXT ,
+.Nm LIST_PREV ,
 .Nm LIST_REMOVE ,
 .Nm LIST_SWAP ,
 .Nm TAILQ_CONCAT ,
@@ -155,6 +156,7 @@ lists and tail queues
 .Fn LIST_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME"
 .Fn LIST_INSERT_HEAD "LIST_HEAD *head" "TYPE *elm" "LIST_ENTRY NAME"
 .Fn LIST_NEXT "TYPE *elm" "LIST_ENTRY NAME"
+.Fn LIST_PREV "TYPE *elm" "LIST_HEAD *head" "TYPE" "LIST_ENTRY NAME"
 .Fn LIST_REMOVE "TYPE *elm" "LIST_ENTRY NAME"
 .Fn LIST_SWAP "LIST_HEAD *head1" "LIST_HEAD *head2" "TYPE" "LIST_ENTRY NAME"
 .\"
@@ -248,8 +250,18 @@ Code size and execution time of operatio
 twice that of the singly-linked data-structures.
 .El
 .Pp
-Linked lists are the simplest of the doubly linked data structures and support
-only the above functionality over singly-linked lists.
+Linked lists are the simplest of the doubly linked data structures.
+They add the following functionality over the above:
+.Bl -enum -compact -offset indent
+.It
+They may be traversed backwards.
+.El
+However:
+.Bl -enum -compact -offset indent
+.It
+To traverse backwards, an entry to begin the traversal and the list in
+which it is contained must be specified.
+.El
 .Pp
 Tail queues add the following functionality:
 .Bl -enum -compact -offset indent
@@ -763,6 +775,14 @@ The macro
 returns the next element in the list, or NULL if this is the last.
 .Pp
 The macro
+.Nm LIST_PREV
+returns the previous element in the list, or NULL if this is the first.
+List
+.Fa head
+must contain element
+.Fa elm .
+.Pp
+The macro
 .Nm LIST_REMOVE
 removes the element
 .Fa elm

Modified: head/sys/sys/cdefs.h
==============================================================================
--- head/sys/sys/cdefs.h	Wed Sep 12 21:00:37 2012	(r240421)
+++ head/sys/sys/cdefs.h	Wed Sep 12 21:03:48 2012	(r240422)
@@ -402,6 +402,8 @@
 #endif
 #define	__rangeof(type, start, end) \
 	(__offsetof(type, end) - __offsetof(type, start))
+#define	__member2struct(s, m, x)					\
+	((struct s *)(void *)((char *)(x) - __offsetof(struct s, m)))
 
 /*
  * Compiler-dependent macros to declare that functions take printf-like

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Wed Sep 12 21:00:37 2012	(r240421)
+++ head/sys/sys/param.h	Wed Sep 12 21:03:48 2012	(r240422)
@@ -334,8 +334,7 @@ __END_DECLS
  * Given the pointer x to the member m of the struct s, return
  * a pointer to the containing structure.
  */
-#define	member2struct(s, m, x)						\
-	((struct s *)(void *)((char *)(x) - offsetof(struct s, m)))
+#define	member2struct(s, m, x) __member2struct(s, m, x)
 
 /*
  * Access a variable length array that has been declared as a fixed

Modified: head/sys/sys/queue.h
==============================================================================
--- head/sys/sys/queue.h	Wed Sep 12 21:00:37 2012	(r240421)
+++ head/sys/sys/queue.h	Wed Sep 12 21:03:48 2012	(r240422)
@@ -65,7 +65,7 @@
  * so that an arbitrary element can be removed without a need to
  * traverse the list. New elements can be added to the list before
  * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
+ * may be traversed in either direction.
  *
  * A tail queue is headed by a pair of pointers, one to the head of the
  * list and the other to the tail of the list. The elements are doubly
@@ -85,7 +85,7 @@
  * _EMPTY			+	+	+	+
  * _FIRST			+	+	+	+
  * _NEXT			+	+	+	+
- * _PREV			-	-	-	+
+ * _PREV			-	+	-	+
  * _LAST			-	-	+	+
  * _FOREACH			+	+	+	+
  * _FOREACH_SAFE		+	+	+	+
@@ -289,8 +289,7 @@ struct {								\
 #define	STAILQ_LAST(head, type, field)					\
 	(STAILQ_EMPTY((head)) ?						\
 		NULL :							\
-	        ((struct type *)(void *)				\
-		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
+		__member2struct(type, field, (head)->stqh_last))
 
 #define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
 
@@ -425,6 +424,11 @@ struct {								\
 
 #define	LIST_NEXT(elm, field)	((elm)->field.le_next)
 
+#define	LIST_PREV(elm, head, type, field)				\
+	((elm)->field.le_prev == &LIST_FIRST((head)) ?			\
+		NULL :							\
+		__member2struct(type, field, (elm)->field.le_prev))
+
 #define	LIST_REMOVE(elm, field) do {					\
 	QMD_SAVELINK(oldnext, (elm)->field.le_next);			\
 	QMD_SAVELINK(oldprev, (elm)->field.le_prev);			\



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209122103.q8CL3nJT047718>