+ {
+ transfer_count = max_transfer_count;
Then, this is redundant.
+ dd->read_ahead.trigger = block + transfer_count / 2;
+ dd->read_ahead.next = block + transfer_count;
+ }
+ else
+ {
+ dd->read_ahead.trigger =
RTEMS_DISK_READ_AHEAD_NO_TRIGGER;
+ }
+ } else {
+ ++dd->stats.read_ahead_transfers_with_size;
}
++dd->stats.read_ahead_transfers;
diff --git a/cpukit/libblock/src/blkdev-print-stats.c
b/cpukit/libblock/src/blkdev-print-stats.c
index 8edf24fd8c..8e07e97b68 100644
--- a/cpukit/libblock/src/blkdev-print-stats.c
+++ b/cpukit/libblock/src/blkdev-print-stats.c
@@ -40,25 +40,27 @@ void rtems_blkdev_print_stats(
printer,
"-------------------------------------------------------------------------------\n"
" DEVICE STATISTICS\n"
-
"----------------------+--------------------------------------------------------\n"
- " MEDIA BLOCK SIZE | %" PRIu32 "\n"
- " MEDIA BLOCK COUNT | %" PRIu32 "\n"
- " BLOCK SIZE | %" PRIu32 "\n"
- " READ HITS | %" PRIu32 "\n"
- " READ MISSES | %" PRIu32 "\n"
- " READ AHEAD TRANSFERS | %" PRIu32 "\n"
- " READ BLOCKS | %" PRIu32 "\n"
- " READ ERRORS | %" PRIu32 "\n"
- " WRITE TRANSFERS | %" PRIu32 "\n"
- " WRITE BLOCKS | %" PRIu32 "\n"
- " WRITE ERRORS | %" PRIu32 "\n"
-
"----------------------+--------------------------------------------------------\n",
+
"--------------------------------+----------------------------------------------\n"
+ " MEDIA BLOCK SIZE | %" PRIu32 "\n"
+ " MEDIA BLOCK COUNT | %" PRIu32 "\n"
+ " BLOCK SIZE | %" PRIu32 "\n"
+ " READ HITS | %" PRIu32 "\n"
+ " READ MISSES | %" PRIu32 "\n"
+ " READ AHEAD TRANSFERS | %" PRIu32 "\n"
+ " READ AHEAD TRANSFERS WITH SIZE | %" PRIu32 "\n"
+ " READ BLOCKS | %" PRIu32 "\n"
+ " READ ERRORS | %" PRIu32 "\n"
+ " WRITE TRANSFERS | %" PRIu32 "\n"
+ " WRITE BLOCKS | %" PRIu32 "\n"
+ " WRITE ERRORS | %" PRIu32 "\n"
+
"--------------------------------+----------------------------------------------\n",
media_block_size,
media_block_count,
block_size,
stats->read_hits,
stats->read_misses,
stats->read_ahead_transfers,
+ stats->read_ahead_transfers_with_size,
stats->read_blocks,
stats->read_errors,
stats->write_transfers,
diff --git a/testsuites/fstests/fsdosfswrite01/init.c
b/testsuites/fstests/fsdosfswrite01/init.c
index e5d8e5d6dd..e87289cf6d 100644
--- a/testsuites/fstests/fsdosfswrite01/init.c
+++ b/testsuites/fstests/fsdosfswrite01/init.c
@@ -126,34 +126,37 @@ static void test_normal_file_write(
const char *file_name )
{
static const rtems_blkdev_stats complete_existing_block_stats = {
- .read_hits = 0,
- .read_misses = 0,
- .read_ahead_transfers = 0,
- .read_blocks = 0,
- .read_errors = 0,
- .write_transfers = 1,
- .write_blocks = 1,
- .write_errors = 0
+ .read_hits = 0,
+ .read_misses = 0,
+ .read_ahead_transfers = 0,
+ .read_ahead_transfers_with_size = 0,
+ .read_blocks = 0,
+ .read_errors = 0,
+ .write_transfers = 1,
+ .write_blocks = 1,
+ .write_errors = 0
};
static const rtems_blkdev_stats complete_new_block_stats = {
- .read_hits = 3,
- .read_misses = 2,
- .read_ahead_transfers = 0,
- .read_blocks = 2,
- .read_errors = 0,
- .write_transfers = 1,
- .write_blocks = 3,
- .write_errors = 0
+ .read_hits = 3,
+ .read_misses = 2,
+ .read_ahead_transfers = 0,
+ .read_ahead_transfers_with_size = 0,
+ .read_blocks = 2,
+ .read_errors = 0,
+ .write_transfers = 1,
+ .write_blocks = 3,
+ .write_errors = 0
};
static const rtems_blkdev_stats partial_new_block_stats = {
- .read_hits = 3,
- .read_misses = 3,
- .read_ahead_transfers = 0,
- .read_blocks = 3,
- .read_errors = 0,
- .write_transfers = 1,
- .write_blocks = 3,
- .write_errors = 0
+ .read_hits = 3,
+ .read_misses = 3,
+ .read_ahead_transfers = 0,
+ .read_ahead_transfers_with_size = 0,
+ .read_blocks = 3,
+ .read_errors = 0,
+ .write_transfers = 1,
+ .write_blocks = 3,
+ .write_errors = 0
};
int rv;
diff --git a/testsuites/libtests/block14/block14.scn
b/testsuites/libtests/block14/block14.scn
index 7170522579..48c22b716d 100644
--- a/testsuites/libtests/block14/block14.scn
+++ b/testsuites/libtests/block14/block14.scn
@@ -6,19 +6,30 @@ action 3
action 4
action 5
action 6
+action 7
+action 8
+action 9
+action 10
+action 11
+action 12
+action 13
+action 14
+action 15
-------------------------------------------------------------------------------
DEVICE STATISTICS
-----------------------+--------------------------------------------------------
- MEDIA BLOCK SIZE | 0
- MEDIA BLOCK COUNT | 1
- BLOCK SIZE | 2
- 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
-----------------------+--------------------------------------------------------
+--------------------------------+----------------------------------------------
+ MEDIA BLOCK SIZE | 0
+ MEDIA BLOCK COUNT | 1
+ BLOCK SIZE | 2
+ READ HITS | 4
+ READ MISSES | 7
+ READ AHEAD TRANSFERS | 6
+ READ AHEAD TRANSFERS WITH SIZE | 3
+ READ BLOCKS | 13
+ 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
index b4e73aadc9..24441c4fe8 100644
--- a/testsuites/libtests/block14/init.c
+++ b/testsuites/libtests/block14/init.c
@@ -29,9 +29,9 @@
const char rtems_test_name[] = "BLOCK 14";
-#define ACTION_COUNT 7
+#define ACTION_COUNT 16
-#define BLOCK_COUNT 6
+#define BLOCK_COUNT 14
#define DISK_PATH "/disk"
@@ -42,50 +42,104 @@ typedef struct {
rtems_blkdev_bnum block,
rtems_bdbuf_buffer **bd_ptr
);
+ void (*peek)(
+ rtems_disk_device *dd,
+ rtems_blkdev_bnum block,
+ uint32_t nr_blocks
+ );
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 }
+ /* normal read ahead */
+ { 0, rtems_bdbuf_read, NULL, RTEMS_SUCCESSFUL, rtems_bdbuf_release },
+ { 1, rtems_bdbuf_read, NULL, RTEMS_SUCCESSFUL, rtems_bdbuf_release },
+ { 2, rtems_bdbuf_read, NULL, RTEMS_SUCCESSFUL, rtems_bdbuf_release },
+
+ /* re-read a cached block */
+ { 0, rtems_bdbuf_read, NULL, RTEMS_SUCCESSFUL, rtems_bdbuf_release },
+
+ /* cause some writes */
+ { 4, rtems_bdbuf_get, NULL, RTEMS_SUCCESSFUL, rtems_bdbuf_sync },
+ { 5, rtems_bdbuf_read, NULL, RTEMS_IO_ERROR, rtems_bdbuf_release },
+ { 5, rtems_bdbuf_get, NULL, RTEMS_SUCCESSFUL, rtems_bdbuf_sync },
+
+ /* interrupt normal read ahead with a peek */
+ { 9, rtems_bdbuf_read, NULL, RTEMS_SUCCESSFUL, rtems_bdbuf_release },
+ { 13, NULL, rtems_bdbuf_peek, 0, NULL },
+ { 10, rtems_bdbuf_read, NULL, RTEMS_SUCCESSFUL,
rtems_bdbuf_release },
+ { 11, rtems_bdbuf_read, NULL, RTEMS_SUCCESSFUL,
rtems_bdbuf_release },
+ { 12, rtems_bdbuf_read, NULL, RTEMS_SUCCESSFUL,
rtems_bdbuf_release },
+
+ /* peek with hit */
+ { 6, NULL, rtems_bdbuf_peek, 0, NULL },
+ { 6, rtems_bdbuf_read, NULL, RTEMS_SUCCESSFUL, rtems_bdbuf_release },
+
+ /* (wrong) peek with reading different block */
+ { 8, NULL, rtems_bdbuf_peek, 0, NULL },
+ { 7, rtems_bdbuf_read, NULL, RTEMS_SUCCESSFUL, rtems_bdbuf_release },
};
-#define STATS(a, b, c, d, e, f, g, h) \
+#define STATS(a, b, c, d, e, f, g, h, i) \
{ \
.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 \
+ .read_ahead_transfers_with_size = d, \
+ .read_blocks = e, \
+ .read_errors = f, \
+ .write_transfers = g, \
+ .write_blocks = h, \
+ .write_errors = i \
}
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)
+ STATS(0, 1, 0, 0, 1, 0, 0, 0, 0),
+ STATS(0, 2, 1, 0, 3, 0, 0, 0, 0),
+ STATS(1, 2, 2, 0, 4, 0, 0, 0, 0),
+
+ STATS(2, 2, 2, 0, 4, 0, 0, 0, 0),
+
+ STATS(2, 2, 2, 0, 4, 0, 1, 1, 0),
+ STATS(2, 3, 2, 0, 5, 1, 1, 1, 0),
+ STATS(2, 3, 2, 0, 5, 1, 2, 2, 1),
+
+ STATS(2, 4, 2, 0, 6, 1, 2, 2, 1),
+ STATS(2, 4, 3, 1, 7, 1, 2, 2, 1),
+ STATS(2, 5, 3, 1, 8, 1, 2, 2, 1),
+ STATS(2, 6, 4, 1, 10, 1, 2, 2, 1),
+ STATS(3, 6, 4, 1, 10, 1, 2, 2, 1),
+
+ STATS(3, 6, 5, 2, 11, 1, 2, 2, 1),
+ STATS(4, 6, 5, 2, 11, 1, 2, 2, 1),
+
+ STATS(4, 6, 6, 3, 12, 1, 2, 2, 1),
+ STATS(4, 7, 6, 3, 13, 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 }
+ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+
+ { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+
+ { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 1, 1, 1, 1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
+
+ { 1, 1, 1, 1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0 },
+ { 1, 1, 1, 1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 1 },
+ { 1, 1, 1, 1, 1, 2, 0, 0, 0, 1, 1, 0, 0, 1 },
+ { 1, 1, 1, 1, 1, 2, 0, 0, 0, 1, 1, 1, 1, 1 },
+ { 1, 1, 1, 1, 1, 2, 0, 0, 0, 1, 1, 1, 1, 1 },
+
+ { 1, 1, 1, 1, 1, 2, 1, 0, 0, 1, 1, 1, 1, 1 },
+ { 1, 1, 1, 1, 1, 2, 1, 0, 0, 1, 1, 1, 1, 1 },
+
+ { 1, 1, 1, 1, 1, 2, 1, 0, 1, 1, 1, 1, 1, 1 },
+ { 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1 },
};
static int block_access_counts [BLOCK_COUNT];
@@ -132,10 +186,16 @@ static void test_actions(rtems_disk_device *dd)
printf("action %i\n", i);
- sc = (*action->get)(dd, action->block, &bd);
- rtems_test_assert(sc == action->expected_get_status);
+ if (action->get != NULL) {
+ sc = (*action->get)(dd, action->block, &bd);
+ rtems_test_assert(sc == action->expected_get_status);
+ }
+
+ if (action->peek != NULL) {
+ (*action->peek)(dd, action->block, 1);
+ }
- if (sc == RTEMS_SUCCESSFUL) {
+ if (sc == RTEMS_SUCCESSFUL && action->release != NULL) {
sc = (*action->release)(bd);
rtems_test_assert(sc == RTEMS_SUCCESSFUL);
}
--
2.26.2
_______________________________________________
devel mailing list
devel@rtems.org <mailto:devel@rtems.org>
http://lists.rtems.org/mailman/listinfo/devel
<http://lists.rtems.org/mailman/listinfo/devel>
