[rtems commit] libblock: Fix purge device tree traversal
Sebastian Huber
sebh at rtems.org
Mon May 14 14:57:18 UTC 2012
Module: rtems
Branch: master
Commit: 3c462734bae0b627df504956cede30f60a4b6e20
Changeset: http://git.rtems.org/rtems/commit/?id=3c462734bae0b627df504956cede30f60a4b6e20
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Mon May 14 12:13:04 2012 +0200
libblock: Fix purge device tree traversal
---
cpukit/libblock/src/bdbuf.c | 3 +-
testsuites/libtests/Makefile.am | 2 +-
testsuites/libtests/block12/Makefile.am | 19 ++++
testsuites/libtests/block12/block12.doc | 11 ++
testsuites/libtests/block12/block12.scn | 2 +
testsuites/libtests/block12/init.c | 153 +++++++++++++++++++++++++++++++
testsuites/libtests/configure.ac | 1 +
7 files changed, 189 insertions(+), 2 deletions(-)
diff --git a/cpukit/libblock/src/bdbuf.c b/cpukit/libblock/src/bdbuf.c
index ad1112b..de2cebd 100644
--- a/cpukit/libblock/src/bdbuf.c
+++ b/cpukit/libblock/src/bdbuf.c
@@ -2853,7 +2853,8 @@ rtems_bdbuf_gather_for_purge (rtems_chain_control *purge_list,
}
else
{
- while (*prev != NULL && cur == (*prev)->avl.right)
+ while (*prev != NULL
+ && (cur == (*prev)->avl.right || (*prev)->avl.right == NULL))
{
/* Up */
cur = *prev;
diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index 9724c1a..1274f26 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS += bspcmdline01 cpuuse devfs01 devfs02 devfs03 devfs04 \
termios termios01 termios02 termios03 termios04 termios05 \
termios06 termios07 termios08 \
rtems++ tztest block01 block02 block03 block04 block05 block06 block07 \
- block08 block09 block10 block11 stringto01 \
+ block08 block09 block10 block11 block12 stringto01 \
tar01 tar02 tar03 \
math mathf mathl complex \
mouse01
diff --git a/testsuites/libtests/block12/Makefile.am b/testsuites/libtests/block12/Makefile.am
new file mode 100644
index 0000000..510cd1c
--- /dev/null
+++ b/testsuites/libtests/block12/Makefile.am
@@ -0,0 +1,19 @@
+rtems_tests_PROGRAMS = block12
+block12_SOURCES = init.c
+
+dist_rtems_tests_DATA = block12.scn block12.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(block12_OBJECTS)
+LINK_LIBS = $(block12_LDLIBS)
+
+block12$(EXEEXT): $(block12_OBJECTS) $(block12_DEPENDENCIES)
+ @rm -f block12$(EXEEXT)
+ $(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block12/block12.doc b/testsuites/libtests/block12/block12.doc
new file mode 100644
index 0000000..b5a345b
--- /dev/null
+++ b/testsuites/libtests/block12/block12.doc
@@ -0,0 +1,11 @@
+This file describes the directives and concepts tested by this test set.
+
+test set name: block12
+
+directives:
+
+ rtems_bdbuf_purge_dev
+
+concepts:
+
+ Ensures that the purge operation traverses the complete block tree
diff --git a/testsuites/libtests/block12/block12.scn b/testsuites/libtests/block12/block12.scn
new file mode 100644
index 0000000..c27babb
--- /dev/null
+++ b/testsuites/libtests/block12/block12.scn
@@ -0,0 +1,2 @@
+*** TEST BLOCK 12 ***
+*** END OF TEST BLOCK 12 ***
diff --git a/testsuites/libtests/block12/init.c b/testsuites/libtests/block12/init.c
new file mode 100644
index 0000000..27bf631
--- /dev/null
+++ b/testsuites/libtests/block12/init.c
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2012 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Obere Lagerstr. 30
+ * 82178 Puchheim
+ * Germany
+ * <rtems at embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ */
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "tmacros.h"
+
+#include <errno.h>
+#include <string.h>
+
+#include <rtems/blkdev.h>
+#include <rtems/bdbuf.h>
+
+#define BLOCK_COUNT 15
+
+static int block_access_counts [BLOCK_COUNT];
+
+static int expected_block_access_counts [BLOCK_COUNT] = {
+ 2, 0, 2, 0, 2, 0, 2, 2, 2, 0, 2, 0, 2, 0, 2
+};
+
+static const rtems_blkdev_bnum read_sequence [] = {
+ 0, 2, 4, 6, 8, 10, 12, 14, 7
+};
+
+static int test_disk_ioctl(rtems_disk_device *dd, uint32_t req, void *arg)
+{
+ int rv = 0;
+
+ if (req == RTEMS_BLKIO_REQUEST) {
+ rtems_blkdev_request *breq = arg;
+ rtems_blkdev_sg_buffer *sg = breq->bufs;
+ uint32_t i;
+
+ rtems_test_assert(breq->req == RTEMS_BLKDEV_REQ_READ);
+
+ for (i = 0; i < breq->bufnum; ++i) {
+ rtems_blkdev_bnum block = sg [i].block;
+
+ rtems_test_assert(block < BLOCK_COUNT);
+
+ ++block_access_counts [block];
+ }
+
+ breq->req_done(breq->done_arg, RTEMS_SUCCESSFUL);
+ } else {
+ errno = EINVAL;
+ rv = -1;
+ }
+
+ return rv;
+}
+
+static void do_read_sequence(rtems_disk_device *dd)
+{
+ size_t i;
+
+ for (i = 0; i < sizeof(read_sequence) / sizeof(read_sequence [0]); ++i) {
+ rtems_status_code sc;
+ rtems_bdbuf_buffer *bd;
+
+ sc = rtems_bdbuf_read(dd, read_sequence [i], &bd);
+ rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+ sc = rtems_bdbuf_release(bd);
+ rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+ }
+}
+
+static void test(void)
+{
+ rtems_status_code sc;
+ dev_t dev = 0;
+ rtems_disk_device *dd;
+
+ sc = rtems_disk_io_initialize();
+ rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+ sc = rtems_disk_create_phys(
+ dev,
+ 1,
+ BLOCK_COUNT,
+ test_disk_ioctl,
+ NULL,
+ NULL
+ );
+ rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+ dd = rtems_disk_obtain(dev);
+ rtems_test_assert(dd != NULL);
+
+ do_read_sequence(dd);
+ rtems_bdbuf_purge_dev(dd);
+ do_read_sequence(dd);
+
+ rtems_test_assert(
+ memcmp(
+ block_access_counts,
+ expected_block_access_counts,
+ sizeof(block_access_counts)
+ ) == 0
+ );
+
+ sc = rtems_disk_release(dd);
+ rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+ sc = rtems_disk_delete(dev);
+ rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+}
+
+static void Init(rtems_task_argument arg)
+{
+ puts("\n\n*** TEST BLOCK 12 ***");
+
+ test();
+
+ puts("*** END OF TEST BLOCK 12 ***");
+
+ rtems_test_exit(0);
+}
+
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
+
+#define CONFIGURE_BDBUF_BUFFER_MIN_SIZE 1
+#define CONFIGURE_BDBUF_BUFFER_MAX_SIZE 1
+#define CONFIGURE_BDBUF_CACHE_MEMORY_SIZE BLOCK_COUNT
+
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+
+#define CONFIGURE_MAXIMUM_TASKS 2
+
+#define CONFIGURE_EXTRA_TASK_STACKS (8 * 1024)
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac
index 12ba194..f6af3b1 100644
--- a/testsuites/libtests/configure.ac
+++ b/testsuites/libtests/configure.ac
@@ -55,6 +55,7 @@ block08/Makefile
block09/Makefile
block10/Makefile
block11/Makefile
+block12/Makefile
bspcmdline01/Makefile
cpuuse/Makefile
devfs01/Makefile
More information about the vc
mailing list