Module Name: src
Committed By: martin
Date: Mon Oct 2 13:21:41 UTC 2017
Modified Files:
src/distrib/sets/lists/debug [netbsd-8]: mi
src/distrib/sets/lists/tests [netbsd-8]: mi
src/share/man/man3 [netbsd-8]: queue.3
src/sys/sys [netbsd-8]: queue.h
src/tests/include/sys [netbsd-8]: Makefile
Added Files:
src/tests/include/sys [netbsd-8]: t_list.c
Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #296):
tests/include/sys/t_list.c: revision 1.1
tests/include/sys/t_list.c: revision 1.2
tests/include/sys/Makefile: revision 1.13
share/man/man3/queue.3: revision 1.59
distrib/sets/lists/debug/mi: revision 1.226
sys/sys/queue.h: revision 1.71
distrib/sets/lists/tests/mi: revision 1.764
Fix the LIST_MOVE macro to properly update the back-pointer of the
first entry in the list.
Note that the signature of LIST_MOVE() macro also changes (it grew an
additional argument). This should not require a kernel version bump
since nothing appears to use LIST_MOVE() other than the recently added
atf test.
Update for new signature for LIST_MOVE()
Add a new minimalistic test for LIST_MOVE to verify that the list's
first entry's prev pointer correctly points to the listhead.
This test will fail until a fix for LIST_MOVE is checked in (soon).
Add new LIST_MOVE test to sets list.
Update recently-added test to adapt to new signature of LIST_MOVE()
add t_list test.
To generate a diff of this commit:
cvs rdiff -u -r1.216.2.3 -r1.216.2.4 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.752.2.2 -r1.752.2.3 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.56 -r1.56.4.1 src/share/man/man3/queue.3
cvs rdiff -u -r1.70 -r1.70.10.1 src/sys/sys/queue.h
cvs rdiff -u -r1.12 -r1.12.6.1 src/tests/include/sys/Makefile
cvs rdiff -u -r0 -r1.2.2.2 src/tests/include/sys/t_list.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.216.2.3 src/distrib/sets/lists/debug/mi:1.216.2.4
--- src/distrib/sets/lists/debug/mi:1.216.2.3 Tue Aug 29 11:51:50 2017
+++ src/distrib/sets/lists/debug/mi Mon Oct 2 13:21:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.216.2.3 2017/08/29 11:51:50 martin Exp $
+# $NetBSD: mi,v 1.216.2.4 2017/10/02 13:21:41 martin Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -1662,6 +1662,7 @@
./usr/libdata/debug/usr/tests/include/sys/t_bitops.debug tests-include-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/include/sys/t_bootblock.debug tests-include-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/include/sys/t_cdefs.debug tests-include-tests debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/include/sys/t_list.debug tests-include-tests debug,atf
./usr/libdata/debug/usr/tests/include/sys/t_pslist.debug tests-include-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/include/sys/t_socket.debug tests-include-tests debug,atf,rump
./usr/libdata/debug/usr/tests/include/sys/t_tree.debug tests-include-tests debug,atf,compattestfile
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.752.2.2 src/distrib/sets/lists/tests/mi:1.752.2.3
--- src/distrib/sets/lists/tests/mi:1.752.2.2 Tue Aug 29 11:51:51 2017
+++ src/distrib/sets/lists/tests/mi Mon Oct 2 13:21:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.752.2.2 2017/08/29 11:51:51 martin Exp $
+# $NetBSD: mi,v 1.752.2.3 2017/10/02 13:21:41 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1588,6 +1588,7 @@
./usr/tests/include/sys/t_bitops tests-include-tests compattestfile,atf
./usr/tests/include/sys/t_bootblock tests-include-tests compattestfile,atf
./usr/tests/include/sys/t_cdefs tests-include-tests compattestfile,atf
+./usr/tests/include/sys/t_list tests-include-tests compattestfile,atf
./usr/tests/include/sys/t_pslist tests-include-tests compattestfile,atf
./usr/tests/include/sys/t_socket tests-include-tests atf,rump
./usr/tests/include/sys/t_tree tests-include-tests compattestfile,atf
Index: src/share/man/man3/queue.3
diff -u src/share/man/man3/queue.3:1.56 src/share/man/man3/queue.3:1.56.4.1
--- src/share/man/man3/queue.3:1.56 Tue Apr 25 06:08:24 2017
+++ src/share/man/man3/queue.3 Mon Oct 2 13:21:41 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: queue.3,v 1.56 2017/04/25 06:08:24 abhinav Exp $
+.\" $NetBSD: queue.3,v 1.56.4.1 2017/10/02 13:21:41 martin Exp $
.\"
.\" Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -53,7 +53,7 @@
.\"
.\" @(#)queue.3 8.1 (Berkeley) 12/13/93
.\"
-.Dd October 15, 2016
+.Dd October 1, 2017
.Dt QUEUE 3
.Os
.Sh NAME
@@ -177,7 +177,7 @@
.Fn LIST_INSERT_HEAD "LIST_HEAD *head" "TYPE *elm" "LIST_ENTRY NAME"
.Fn LIST_REMOVE "TYPE *elm" "LIST_ENTRY NAME"
.Fn LIST_REPLACE "TYPE *elm" "TYPE *new" "LIST_ENTRY NAME"
-.Fn LIST_MOVE "LIST_HEAD *head1" "LIST_HEAD *head2"
+.Fn LIST_MOVE "LIST_HEAD *head1" "LIST_HEAD *head2" "LIST_ENTRY NAME"
.Pp
.Fn SIMPLEQ_HEAD "HEADNAME" "TYPE"
.Fn SIMPLEQ_HEAD_INITIALIZER "head"
Index: src/sys/sys/queue.h
diff -u src/sys/sys/queue.h:1.70 src/sys/sys/queue.h:1.70.10.1
--- src/sys/sys/queue.h:1.70 Mon Nov 2 15:21:23 2015
+++ src/sys/sys/queue.h Mon Oct 2 13:21:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: queue.h,v 1.70 2015/11/02 15:21:23 christos Exp $ */
+/* $NetBSD: queue.h,v 1.70.10.1 2017/10/02 13:21:41 martin Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -211,10 +211,11 @@ struct { \
((tvar) = LIST_NEXT((var), field), 1); \
(var) = (tvar))
-#define LIST_MOVE(head1, head2) do { \
+#define LIST_MOVE(head1, head2, field) do { \
LIST_INIT((head2)); \
if (!LIST_EMPTY((head1))) { \
(head2)->lh_first = (head1)->lh_first; \
+ (head2)->lh_first->field.le_prev = &(head2)->lh_first; \
LIST_INIT((head1)); \
} \
} while (/*CONSTCOND*/0)
Index: src/tests/include/sys/Makefile
diff -u src/tests/include/sys/Makefile:1.12 src/tests/include/sys/Makefile:1.12.6.1
--- src/tests/include/sys/Makefile:1.12 Mon Aug 8 14:11:08 2016
+++ src/tests/include/sys/Makefile Mon Oct 2 13:21:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/08 14:11:08 pgoyette Exp $
+# $NetBSD: Makefile,v 1.12.6.1 2017/10/02 13:21:40 martin Exp $
NOMAN= # defined
@@ -9,6 +9,7 @@ TESTSDIR= ${TESTSBASE}/include/sys
TESTS_C+= t_bitops
TESTS_C+= t_bootblock
TESTS_C+= t_cdefs
+TESTS_C+= t_list
TESTS_C+= t_pslist
TESTS_C+= t_tree
TESTS_C+= t_types
Added files:
Index: src/tests/include/sys/t_list.c
diff -u /dev/null src/tests/include/sys/t_list.c:1.2.2.2
--- /dev/null Mon Oct 2 13:21:41 2017
+++ src/tests/include/sys/t_list.c Mon Oct 2 13:21:40 2017
@@ -0,0 +1,89 @@
+/* $NetBSD: t_list.c,v 1.2.2.2 2017/10/02 13:21:40 martin Exp $ */
+
+/*-
+ * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Paul Goyette
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/queue.h>
+
+#include <atf-c.h>
+
+/*
+ * XXX This is a limited test to make sure the operations behave as
+ * described on a sequential machine. It does nothing to test the
+ * pserialize-safety of any operations.
+ */
+
+ATF_TC(list_move);
+ATF_TC_HEAD(list_move, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "LIST_MOVE verification");
+}
+ATF_TC_BODY(list_move, tc)
+{
+ LIST_HEAD(listhead, entry) old_head, new_head, old_copy;
+ struct entry {
+ LIST_ENTRY(entry) entries;
+ uint64_t value;
+ } *n1, *n2, *n3;
+
+ LIST_INIT(&old_head);
+
+ n1 = malloc(sizeof(struct entry));
+ n1->value = 1;
+ LIST_INSERT_HEAD(&old_head, n1, entries);
+
+ n2 = malloc(sizeof(struct entry));
+ n2->value = 2;
+ LIST_INSERT_HEAD(&old_head, n2, entries);
+
+ LIST_MOVE(&old_head, &new_head, entries);
+
+ memcpy(&old_copy, &old_head, sizeof(old_head));
+
+ n3 = LIST_FIRST(&new_head);
+ ATF_CHECK_MSG(n3->value = 2, "Unexpected value for LIST_FIRST");
+
+ LIST_REMOVE(n3, entries);
+ ATF_CHECK_MSG(memcmp(&old_copy, &old_head, sizeof(old_head)) == 0,
+ "Unexpected modification of old_head during LIST_REMOVE");
+
+ LIST_REMOVE(LIST_FIRST(&new_head), entries);
+ ATF_CHECK_MSG(LIST_EMPTY(&new_head), "New list not empty!");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, list_move);
+
+ return atf_no_error();
+}
