X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=4f3d6cdf7ea4e4e62915343e00e2c5ede8bb52bd;hp=e1afeb9a4bf552ff3b8fad4060f22ffdb6a9e696;hb=e5b401d4bf67a1704f28872d3abe09eaf65cdabe;hpb=b2a151925a91f38aeb298d693687a47269ad4e94;ds=sidebyside

diff --git a/filesetup.c b/filesetup.c
index e1afeb9a..4f3d6cdf 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -183,6 +183,30 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
 	return 0;
 }
 
+int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
+{
+	int ret = 0;
+
+	/*
+	 * FIXME: add blockdev flushing too
+	 */
+	if (td->io_ops->flags & FIO_MMAPIO)
+		ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
+	else if (td->filetype == FIO_TYPE_FILE)
+		ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
+	else if (td->filetype == FIO_TYPE_BD)
+		ret = blockdev_invalidate_cache(f->fd);
+	else if (td->filetype == FIO_TYPE_CHAR)
+		ret = 0;
+
+	if (ret < 0) {
+		td_verror(td, errno);
+		return 1;
+	}
+
+	return 0;
+}
+
 static int __setup_file_mmap(struct thread_data *td, struct fio_file *f)
 {
 	int flags;
@@ -204,12 +228,8 @@ static int __setup_file_mmap(struct thread_data *td, struct fio_file *f)
 		return 1;
 	}
 
-	if (td->invalidate_cache) {
-		if (madvise(f->mmap, f->file_size, MADV_DONTNEED) < 0) {
-			td_verror(td, errno);
-			return 1;
-		}
-	}
+	if (td->invalidate_cache && file_invalidate_cache(td, f))
+		return 1;
 
 	if (td->sequential) {
 		if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
@@ -242,12 +262,8 @@ static int setup_files_mmap(struct thread_data *td)
 
 static int __setup_file_plain(struct thread_data *td, struct fio_file *f)
 {
-	if (td->invalidate_cache) {
-		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED) < 0) {
-			td_verror(td, errno);
-			return 1;
-		}
-	}
+	if (td->invalidate_cache && file_invalidate_cache(td, f))
+		return 1;
 
 	if (td->sequential) {
 		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
@@ -364,6 +380,8 @@ void close_files(struct thread_data *td)
 		struct fio_file *f = &td->files[i];
 
 		if (f->fd != -1) {
+			if (td->unlink && td->filetype == FIO_TYPE_FILE)
+				unlink(f->file_name);
 			close(f->fd);
 			f->fd = -1;
 		}