projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Botch edit in files setup
[fio.git]
/
log.c
diff --git
a/log.c
b/log.c
index 082cfd410bcbe356f2451f32399b164a6de45093..6604c1c8ac9295877e2f2a5b95ef2d54f09b21da 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-4,15
+4,16
@@
*/
#include <stdio.h>
#include <stdlib.h>
*/
#include <stdio.h>
#include <stdlib.h>
+#include <libgen.h>
#include <assert.h>
#include <assert.h>
-#include "list.h"
+#include "
f
list.h"
#include "fio.h"
static const char iolog_ver2[] = "fio version 2 iolog";
void queue_io_piece(struct thread_data *td, struct io_piece *ipo)
{
#include "fio.h"
static const char iolog_ver2[] = "fio version 2 iolog";
void queue_io_piece(struct thread_data *td, struct io_piece *ipo)
{
- list_add_tail(&ipo->list, &td->io_log_list);
+
f
list_add_tail(&ipo->list, &td->io_log_list);
td->total_io_size += ipo->len;
}
td->total_io_size += ipo->len;
}
@@
-40,6
+41,13
@@
void log_file(struct thread_data *td, struct fio_file *f,
if (!td->o.write_iolog_file)
return;
if (!td->o.write_iolog_file)
return;
+
+ /*
+ * this happens on the pre-open/close done before the job starts
+ */
+ if (!td->iolog_f)
+ return;
+
fprintf(td->iolog_f, "%s %s\n", f->file_name, act[what]);
}
fprintf(td->iolog_f, "%s %s\n", f->file_name, act[what]);
}
@@
-101,11
+109,11
@@
int read_iolog_get(struct thread_data *td, struct io_u *io_u)
{
struct io_piece *ipo;
{
struct io_piece *ipo;
- while (!list_empty(&td->io_log_list)) {
+ while (!
f
list_empty(&td->io_log_list)) {
int ret;
int ret;
- ipo = list_entry(td->io_log_list.next, struct io_piece, list);
- list_del(&ipo->list);
+ ipo =
f
list_entry(td->io_log_list.next, struct io_piece, list);
+
f
list_del(&ipo->list);
ret = ipo_special(td, ipo);
if (ret < 0) {
ret = ipo_special(td, ipo);
if (ret < 0) {
@@
-147,9
+155,9
@@
void prune_io_piece_log(struct thread_data *td)
free(ipo);
}
free(ipo);
}
- while (!list_empty(&td->io_hist_list)) {
- ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
- list_del(&ipo->list);
+ while (!
f
list_empty(&td->io_hist_list)) {
+ ipo =
f
list_entry(td->io_hist_list.next, struct io_piece, list);
+
f
list_del(&ipo->list);
free(ipo);
}
}
free(ipo);
}
}
@@
-175,28
+183,40
@@
void log_io_piece(struct thread_data *td, struct io_u *io_u)
*
* For both these cases, just reading back data in the order we
* wrote it out is the fastest.
*
* For both these cases, just reading back data in the order we
* wrote it out is the fastest.
+ *
+ * One exception is if we don't have a random map AND we are doing
+ * verifies, in that case we need to check for duplicate blocks and
+ * drop the old one, which we rely on the rb insert/lookup for
+ * handling.
*/
*/
- if (!td_random(td) || !td->o.overwrite) {
- INIT_LIST_HEAD(&ipo->list);
- list_add_tail(&ipo->list, &td->io_hist_list);
+ if ((!td_random(td) || !td->o.overwrite) &&
+ (file_randommap(td, ipo->file) || td->o.verify == VERIFY_NONE)) {
+ INIT_FLIST_HEAD(&ipo->list);
+ flist_add_tail(&ipo->list, &td->io_hist_list);
return;
}
RB_CLEAR_NODE(&ipo->rb_node);
return;
}
RB_CLEAR_NODE(&ipo->rb_node);
- p = &td->io_hist_tree.rb_node;
- parent = NULL;
/*
* Sort the entry into the verification list
*/
/*
* Sort the entry into the verification list
*/
+restart:
+ p = &td->io_hist_tree.rb_node;
+ parent = NULL;
while (*p) {
parent = *p;
__ipo = rb_entry(parent, struct io_piece, rb_node);
while (*p) {
parent = *p;
__ipo = rb_entry(parent, struct io_piece, rb_node);
- if (ipo->offset <
=
__ipo->offset)
+ if (ipo->offset < __ipo->offset)
p = &(*p)->rb_left;
p = &(*p)->rb_left;
- else
+ else
if (ipo->offset > __ipo->offset)
p = &(*p)->rb_right;
p = &(*p)->rb_right;
+ else {
+ assert(ipo->len == __ipo->len);
+ rb_erase(parent, &td->io_hist_tree);
+ goto restart;
+ }
}
rb_link_node(&ipo->rb_node, parent, p);
}
rb_link_node(&ipo->rb_node, parent, p);
@@
-299,7
+319,7
@@
static int read_iolog2(struct thread_data *td, FILE *f)
*/
ipo = malloc(sizeof(*ipo));
memset(ipo, 0, sizeof(*ipo));
*/
ipo = malloc(sizeof(*ipo));
memset(ipo, 0, sizeof(*ipo));
- INIT_LIST_HEAD(&ipo->list);
+ INIT_
F
LIST_HEAD(&ipo->list);
ipo->offset = offset;
ipo->len = bytes;
ipo->ddir = rw;
ipo->offset = offset;
ipo->len = bytes;
ipo->ddir = rw;
@@
-334,15
+354,6
@@
static int read_iolog2(struct thread_data *td, FILE *f)
return 0;
}
return 0;
}
-/*
- * Read version 1 iolog data.
- */
-static int read_iolog(struct thread_data *td, FILE *f)
-{
- log_err("fio: iolog version 1 is no longer supported\n");
- return 1;
-}
-
/*
* open iolog, check version, and call appropriate parser
*/
/*
* open iolog, check version, and call appropriate parser
*/
@@
-372,16
+383,8
@@
static int init_iolog_read(struct thread_data *td)
if (!strncmp(iolog_ver2, buffer, strlen(iolog_ver2)))
ret = read_iolog2(td, f);
else {
if (!strncmp(iolog_ver2, buffer, strlen(iolog_ver2)))
ret = read_iolog2(td, f);
else {
- /*
- * seek back to the beginning
- */
- if (fseek(f, 0, SEEK_SET) < 0) {
- td_verror(td, errno, "iolog read");
- log_err("fio: unable to read iolog\n");
- return 1;
- }
-
- ret = read_iolog(td, f);
+ log_err("fio: iolog version 1 is no longer supported\n");
+ ret = 1;
}
fclose(f);
}
fclose(f);
@@
-397,7
+400,7
@@
static int init_iolog_write(struct thread_data *td)
FILE *f;
unsigned int i;
FILE *f;
unsigned int i;
- f = fopen(td->o.write_iolog_file, "
w+
");
+ f = fopen(td->o.write_iolog_file, "
a
");
if (!f) {
perror("fopen write iolog");
return 1;
if (!f) {
perror("fopen write iolog");
return 1;
@@
-464,7
+467,7
@@
void __finish_log(struct io_log *log, const char *name)
unsigned int i;
FILE *f;
unsigned int i;
FILE *f;
- f = fopen(name, "
w
");
+ f = fopen(name, "
a
");
if (!f) {
perror("fopen log");
return;
if (!f) {
perror("fopen log");
return;
@@
-480,10
+483,17
@@
void __finish_log(struct io_log *log, const char *name)
free(log);
}
free(log);
}
-void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+void finish_log_named(struct thread_data *td, struct io_log *log,
+ const char *prefix, const char *postfix)
{
{
- char file_name[256];
+ char file_name[256], *p;
+
+ snprintf(file_name, 200, "%s_%s.log", prefix, postfix);
+ p = basename(file_name);
+ __finish_log(log, p);
+}
- snprintf(file_name, 200, "%s_%s.log", td->o.name, name);
- __finish_log(log, file_name);
+void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+{
+ finish_log_named(td, log, td->o.name, name);
}
}