The following changes since commit d39879467ccb7f136815be0ba7fd283524c2dafb:
Windows 32-bit fio fixes (2012-06-08 08:12:20 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (3):
Add a more verbose/immediate warning if we fail open with O_DIRECT
blktrace: use for_each_file() instead of open coding the loop
Revert "blktrace: use for_each_file() instead of open coding the loop"
Shaohua Li (1):
Fix "fio: file hash not empty on exit" with blktrace replay
blktrace.c | 41 ++++++++++++++++++++++++++++-------------
file.h | 1 +
filesetup.c | 6 ++++++
3 files changed, 35 insertions(+), 13 deletions(-)
---
Diff of recent changes:
diff --git a/blktrace.c b/blktrace.c
index 1b9bf3b..e195f7f 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -163,7 +163,7 @@ static int lookup_device(struct thread_data *td, char *path, unsigned int maj,
#define FMAJOR(dev) ((unsigned int) ((dev) >> FMINORBITS))
#define FMINOR(dev) ((unsigned int) ((dev) & FMINORMASK))
-static void trace_add_open_event(struct thread_data *td, int fileno)
+static void trace_add_open_close_event(struct thread_data *td, int fileno, enum file_log_act action)
{
struct io_piece *ipo;
@@ -172,13 +172,13 @@ static void trace_add_open_event(struct thread_data *td, int fileno)
ipo->ddir = DDIR_INVAL;
ipo->fileno = fileno;
- ipo->file_action = FIO_LOG_OPEN_FILE;
+ ipo->file_action = action;
flist_add_tail(&ipo->list, &td->io_log_list);
}
-static void trace_add_file(struct thread_data *td, __u32 device)
+static int trace_add_file(struct thread_data *td, __u32 device)
{
- static unsigned int last_maj, last_min;
+ static unsigned int last_maj, last_min, last_fileno;
unsigned int maj = FMAJOR(device);
unsigned int min = FMINOR(device);
struct fio_file *f;
@@ -186,7 +186,7 @@ static void trace_add_file(struct thread_data *td, __u32 device)
unsigned int i;
if (last_maj == maj && last_min == min)
- return;
+ return last_fileno;
last_maj = maj;
last_min = min;
@@ -195,8 +195,10 @@ static void trace_add_file(struct thread_data *td, __u32 device)
* check for this file in our list
*/
for_each_file(td, f, i)
- if (f->major == maj && f->minor == min)
- return;
+ if (f->major == maj && f->minor == min) {
+ last_fileno = f->fileno;
+ return last_fileno;
+ }
strcpy(dev, "/dev");
if (lookup_device(td, dev, maj, min)) {
@@ -204,15 +206,18 @@ static void trace_add_file(struct thread_data *td, __u32 device)
dprint(FD_BLKTRACE, "add devices %s\n", dev);
fileno = add_file_exclusive(td, dev);
- trace_add_open_event(td, fileno);
+ trace_add_open_close_event(td, fileno, FIO_LOG_OPEN_FILE);
+ last_fileno = fileno;
}
+ return last_fileno;
}
/*
* Store blk_io_trace data in an ipo for later retrieval.
*/
static void store_ipo(struct thread_data *td, unsigned long long offset,
- unsigned int bytes, int rw, unsigned long long ttime)
+ unsigned int bytes, int rw, unsigned long long ttime,
+ int fileno)
{
struct io_piece *ipo = malloc(sizeof(*ipo));
@@ -228,6 +233,7 @@ static void store_ipo(struct thread_data *td, unsigned long long offset,
ipo->ddir = DDIR_WRITE;
else
ipo->ddir = DDIR_READ;
+ ipo->fileno = fileno;
dprint(FD_BLKTRACE, "store ddir=%d, off=%llu, len=%lu, delay=%lu\n",
ipo->ddir, ipo->offset,
@@ -256,9 +262,10 @@ static void handle_trace_discard(struct thread_data *td, struct blk_io_trace *t,
unsigned long long ttime, unsigned long *ios)
{
struct io_piece *ipo = malloc(sizeof(*ipo));
+ int fileno;
init_ipo(ipo);
- trace_add_file(td, t->device);
+ fileno = trace_add_file(td, t->device);
ios[DDIR_WRITE]++;
td->o.size += t->bytes;
@@ -273,6 +280,7 @@ static void handle_trace_discard(struct thread_data *td, struct blk_io_trace *t,
ipo->len = t->bytes;
ipo->delay = ttime / 1000;
ipo->ddir = DDIR_TRIM;
+ ipo->fileno = fileno;
dprint(FD_BLKTRACE, "store discard, off=%llu, len=%lu, delay=%lu\n",
ipo->offset, ipo->len,
@@ -285,8 +293,9 @@ static void handle_trace_fs(struct thread_data *td, struct blk_io_trace *t,
unsigned int *bs)
{
int rw;
+ int fileno;
- trace_add_file(td, t->device);
+ fileno = trace_add_file(td, t->device);
rw = (t->action & BLK_TC_ACT(BLK_TC_WRITE)) != 0;
@@ -295,7 +304,7 @@ static void handle_trace_fs(struct thread_data *td, struct blk_io_trace *t,
ios[rw]++;
td->o.size += t->bytes;
- store_ipo(td, t->sector, t->bytes, rw, ttime);
+ store_ipo(td, t->sector, t->bytes, rw, ttime, fileno);
}
/*
@@ -331,7 +340,8 @@ int load_blktrace(struct thread_data *td, const char *filename)
unsigned int cpu;
unsigned int rw_bs[2];
struct fifo *fifo;
- int fd;
+ int fd, i;
+ struct fio_file *f;
fd = open(filename, O_RDONLY);
if (fd < 0) {
@@ -408,6 +418,11 @@ int load_blktrace(struct thread_data *td, const char *filename)
}
} while (1);
+ for (i = 0; i < td->files_index; i++) {
+ f= td->files[i];
+ trace_add_open_close_event(td, f->fileno, FIO_LOG_CLOSE_FILE);
+ }
+
fifo_free(fifo);
close(fd);
diff --git a/file.h b/file.h
index 1d6624e..51df839 100644
--- a/file.h
+++ b/file.h
@@ -72,6 +72,7 @@ struct fio_file {
*/
char *file_name;
unsigned int major, minor;
+ int fileno;
void *mmap_ptr;
size_t mmap_sz;
diff --git a/filesetup.c b/filesetup.c
index a1ad026..371b405 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -526,6 +526,11 @@ open_again:
snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
+ if (__e == EINVAL && (flags & OS_O_DIRECT)) {
+ log_err("fio: looks like your file system does not " \
+ "support direct=1/buffered=0\n");
+ }
+
td_verror(td, __e, buf);
}
@@ -974,6 +979,7 @@ int add_file(struct thread_data *td, const char *fname)
td->files_size = new_size;
}
td->files[cur_files] = f;
+ f->fileno = cur_files;
/*
* init function, io engine may not be loaded yet
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
