libblock: Add block device statistics

6 files changed, 275 insertions, 0 deletions

diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index 9747ad19c6..6a0d20f50d 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -1,6 +1,7 @@
 ACLOCAL_AMFLAGS = -I ../aclocal
 
 SUBDIRS = POSIX
+SUBDIRS += block14
 SUBDIRS += block13
 SUBDIRS += rbheap01
 SUBDIRS += flashdisk01
diff --git a/testsuites/libtests/block14/Makefile.am b/testsuites/libtests/block14/Makefile.am
new file mode 100644
index 0000000000..a7769de3e0
--- /dev/null
+++ b/testsuites/libtests/block14/Makefile.am
@@ -0,0 +1,19 @@
+rtems_tests_PROGRAMS = block14
+block14_SOURCES = init.c
+
+dist_rtems_tests_DATA = block14.scn block14.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(block14_OBJECTS)
+LINK_LIBS = $(block14_LDLIBS)
+
+block14$(EXEEXT): $(block14_OBJECTS) $(block14_DEPENDENCIES)
+	@rm -f block14$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block14/block14.doc b/testsuites/libtests/block14/block14.doc
new file mode 100644
index 0000000000..de5bc68cbc
--- /dev/null
+++ b/testsuites/libtests/block14/block14.doc
@@ -0,0 +1,11 @@
+This file describes the directives and concepts tested by this test set.
+
+test set name: block14
+
+directives:
+
+  TBD
+
+concepts:
+
+  Ensure that the block device statistics work.
diff --git a/testsuites/libtests/block14/block14.scn b/testsuites/libtests/block14/block14.scn
new file mode 100644
index 0000000000..009ebb0698
--- /dev/null
+++ b/testsuites/libtests/block14/block14.scn
@@ -0,0 +1,21 @@
+*** TEST BLOCK 14 ***
+action 0
+action 1
+action 2
+action 3
+action 4
+action 5
+action 6
+-------------------------------------------------------------------------------
+                               DEVICE STATISTICS
+----------------------+--------------------------------------------------------
+ READ HITS            | 2
+ READ MISSES          | 3
+ READ AHEAD TRANSFERS | 2
+ READ BLOCKS          | 5
+ READ ERRORS          | 1
+ WRITE TRANSFERS      | 2
+ WRITE BLOCKS         | 2
+ WRITE ERRORS         | 1
+----------------------+--------------------------------------------------------
+*** END OF TEST BLOCK 14 ***
diff --git a/testsuites/libtests/block14/init.c b/testsuites/libtests/block14/init.c
new file mode 100644
index 0000000000..b95b86d740
--- /dev/null
+++ b/testsuites/libtests/block14/init.c
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2012 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Obere Lagerstr. 30
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@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 ACTION_COUNT 7
+
+#define BLOCK_COUNT 6
+
+typedef struct {
+  rtems_blkdev_bnum block;
+  rtems_status_code (*get)(
+    rtems_disk_device *dd,
+    rtems_blkdev_bnum block,
+    rtems_bdbuf_buffer **bd_ptr
+  );
+  rtems_status_code expected_get_status;
+  rtems_status_code (*release)(rtems_bdbuf_buffer *bd);
+} test_action;
+
+static const test_action actions [ACTION_COUNT] = {
+  { 0, rtems_bdbuf_read, RTEMS_SUCCESSFUL, rtems_bdbuf_release },
+  { 1, rtems_bdbuf_read, RTEMS_SUCCESSFUL, rtems_bdbuf_release },
+  { 2, rtems_bdbuf_read, RTEMS_SUCCESSFUL, rtems_bdbuf_release },
+  { 0, rtems_bdbuf_read, RTEMS_SUCCESSFUL, rtems_bdbuf_release },
+  { 4, rtems_bdbuf_get, RTEMS_SUCCESSFUL, rtems_bdbuf_sync },
+  { 5, rtems_bdbuf_read, RTEMS_IO_ERROR, rtems_bdbuf_release },
+  { 5, rtems_bdbuf_get, RTEMS_SUCCESSFUL, rtems_bdbuf_sync }
+};
+
+#define STATS(a, b, c, d, e, f, g, h) \
+  { \
+    .read_hits = a, \
+    .read_misses = b, \
+    .read_ahead_transfers = c, \
+    .read_blocks = d, \
+    .read_errors = e, \
+    .write_transfers = f, \
+    .write_blocks = g, \
+    .write_errors = h \
+  }
+
+static const rtems_blkdev_stats expected_stats [ACTION_COUNT] = {
+  STATS(0, 1, 0, 1, 0, 0, 0, 0),
+  STATS(0, 2, 1, 3, 0, 0, 0, 0),
+  STATS(1, 2, 2, 4, 0, 0, 0, 0),
+  STATS(2, 2, 2, 4, 0, 0, 0, 0),
+  STATS(2, 2, 2, 4, 0, 1, 1, 0),
+  STATS(2, 3, 2, 5, 1, 1, 1, 0),
+  STATS(2, 3, 2, 5, 1, 2, 2, 1)
+};
+
+static const int expected_block_access_counts [ACTION_COUNT] [BLOCK_COUNT] = {
+   { 1, 0, 0, 0, 0, 0 },
+   { 1, 1, 1, 0, 0, 0 },
+   { 1, 1, 1, 1, 0, 0 },
+   { 1, 1, 1, 1, 0, 0 },
+   { 1, 1, 1, 1, 1, 0 },
+   { 1, 1, 1, 1, 1, 1 },
+   { 1, 1, 1, 1, 1, 2 }
+};
+
+static int block_access_counts [BLOCK_COUNT];
+
+static int test_disk_ioctl(rtems_disk_device *dd, uint32_t req, void *arg)
+{
+  int rv = 0;
+
+  if (req == RTEMS_BLKIO_REQUEST) {
+    rtems_status_code sc = RTEMS_SUCCESSFUL;
+    rtems_blkdev_request *breq = arg;
+    rtems_blkdev_sg_buffer *sg = breq->bufs;
+    uint32_t i;
+
+    for (i = 0; i < breq->bufnum; ++i) {
+      rtems_blkdev_bnum block = sg [i].block;
+
+      rtems_test_assert(block < BLOCK_COUNT);
+
+      ++block_access_counts [block];
+
+      if (block == 5) {
+        sc = RTEMS_IO_ERROR;
+      }
+    }
+
+    (*breq->req_done)(breq->done_arg, sc);
+  } else {
+    errno = EINVAL;
+    rv = -1;
+  }
+
+  return rv;
+}
+
+static void test_actions(rtems_disk_device *dd)
+{
+  int i;
+
+  for (i = 0; i < ACTION_COUNT; ++i) {
+    const test_action *action = &actions [i];
+    rtems_status_code sc;
+    rtems_bdbuf_buffer *bd;
+    rtems_blkdev_stats stats;
+
+    printf("action %i\n", i);
+
+    sc = (*action->get)(dd, action->block, &bd);
+    rtems_test_assert(sc == action->expected_get_status);
+
+    if (sc == RTEMS_SUCCESSFUL) {
+      sc = (*action->release)(bd);
+      rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+    }
+
+    rtems_test_assert(
+      memcmp(
+        block_access_counts,
+        expected_block_access_counts [i],
+        sizeof(block_access_counts)
+      ) == 0
+    );
+
+    rtems_bdbuf_get_device_stats(dd, &stats);
+
+    rtems_test_assert(
+      memcmp(
+        &stats,
+        &expected_stats [i],
+        sizeof(stats)
+      ) == 0
+    );
+  }
+
+  rtems_blkdev_print_stats(&dd->stats, rtems_printf_plugin, NULL);
+}
+
+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);
+
+  test_actions(dd);
+
+  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 14 ***");
+
+  test();
+
+  puts("*** END OF TEST BLOCK 14 ***");
+
+  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_BDBUF_MAX_READ_AHEAD_BLOCKS 1
+#define CONFIGURE_BDBUF_READ_AHEAD_TASK_PRIORITY 1
+
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+
+#define CONFIGURE_MAXIMUM_TASKS 1
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES
+#define CONFIGURE_INIT_TASK_PRIORITY 2
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac
index 7df0520f87..f383ac17a4 100644
--- a/testsuites/libtests/configure.ac
+++ b/testsuites/libtests/configure.ac
@@ -41,6 +41,7 @@ AM_CONDITIONAL(NETTESTS,test "$rtems_cv_RTEMS_NETWORKING" = "yes")
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
+block14/Makefile
 block13/Makefile
 rbheap01/Makefile
 syscall01/Makefile