projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill off -Wshadow again
[fio.git]
/
iolog.c
diff --git
a/iolog.c
b/iolog.c
index 45ef6becf51c4ba7fbac730f8dabc2a2c96e5c58..785e549acee76ed8f40de68615d355bcf32b33d7 100644
(file)
--- a/
iolog.c
+++ b/
iolog.c
@@
-28,19
+28,14
@@
void queue_io_piece(struct thread_data *td, struct io_piece *ipo)
td->total_io_size += ipo->len;
}
td->total_io_size += ipo->len;
}
-void log_io_u(
struct thread_data *td,
struct io_u *io_u)
+void log_io_u(
const struct thread_data *td, const
struct io_u *io_u)
{
{
- const char *act[] = { "read", "write", "sync", "datasync",
- "sync_file_range", "wait", "trim" };
-
- assert(io_u->ddir <= 6);
-
if (!td->o.write_iolog_file)
return;
fprintf(td->iolog_f, "%s %s %llu %lu\n", io_u->file->file_name,
if (!td->o.write_iolog_file)
return;
fprintf(td->iolog_f, "%s %s %llu %lu\n", io_u->file->file_name,
-
act[io_u->ddir], io_u->offset
,
- io_u->buflen);
+
io_ddir_name(io_u->ddir)
,
+ io_u->
offset, io_u->
buflen);
}
void log_file(struct thread_data *td, struct fio_file *f,
}
void log_file(struct thread_data *td, struct fio_file *f,
@@
-73,12
+68,6
@@
static void iolog_delay(struct thread_data *td, unsigned long delay)
delay -= usec;
delay -= usec;
- /*
- * less than 100 usec delay, just regard it as noise
- */
- if (delay < 100)
- return;
-
while (delay && !td->terminate) {
this_delay = delay;
if (this_delay > 500000)
while (delay && !td->terminate) {
this_delay = delay;
if (this_delay > 500000)
@@
-113,7
+102,7
@@
static int ipo_special(struct thread_data *td, struct io_piece *ipo)
td_io_close_file(td, f);
break;
case FIO_LOG_UNLINK_FILE:
td_io_close_file(td, f);
break;
case FIO_LOG_UNLINK_FILE:
-
unlink(f->file_name
);
+
td_io_unlink_file(td, f
);
break;
default:
log_err("fio: bad file action %d\n", ipo->file_action);
break;
default:
log_err("fio: bad file action %d\n", ipo->file_action);
@@
-184,7
+173,7
@@
void prune_io_piece_log(struct thread_data *td)
}
while (!flist_empty(&td->io_hist_list)) {
}
while (!flist_empty(&td->io_hist_list)) {
- ipo = flist_entry(&td->io_hist_list, struct io_piece, list);
+ ipo = flist_
first_
entry(&td->io_hist_list, struct io_piece, list);
flist_del(&ipo->list);
remove_trim_entry(td, ipo);
td->io_hist_len--;
flist_del(&ipo->list);
remove_trim_entry(td, ipo);
td->io_hist_len--;
@@
-293,7
+282,7
@@
void unlog_io_piece(struct thread_data *td, struct io_u *io_u)
td->io_hist_len--;
}
td->io_hist_len--;
}
-void trim_io_piece(struct thread_data *td, struct io_u *io_u)
+void trim_io_piece(struct thread_data *td,
const
struct io_u *io_u)
{
struct io_piece *ipo = io_u->ipo;
{
struct io_piece *ipo = io_u->ipo;
@@
-550,9
+539,9
@@
int init_iolog(struct thread_data *td)
void setup_log(struct io_log **log, struct log_params *p,
const char *filename)
{
void setup_log(struct io_log **log, struct log_params *p,
const char *filename)
{
- struct io_log *l
= malloc(sizeof(*l))
;
+ struct io_log *l;
-
memset(l, 0
, sizeof(*l));
+
l = calloc(1
, sizeof(*l));
l->nr_samples = 0;
l->max_samples = 1024;
l->log_type = p->log_type;
l->nr_samples = 0;
l->max_samples = 1024;
l->log_type = p->log_type;
@@
-735,6
+724,11
@@
static void finish_chunk(z_stream *stream, FILE *f,
static size_t inflate_chunk(struct iolog_compress *ic, int gz_hdr, FILE *f,
z_stream *stream, struct inflate_chunk_iter *iter)
{
static size_t inflate_chunk(struct iolog_compress *ic, int gz_hdr, FILE *f,
z_stream *stream, struct inflate_chunk_iter *iter)
{
+ size_t ret;
+
+ dprint(FD_COMPRESS, "inflate chunk size=%lu, seq=%u",
+ (unsigned long) ic->len, ic->seq);
+
if (ic->seq != iter->seq) {
if (iter->seq)
finish_chunk(stream, f, iter);
if (ic->seq != iter->seq) {
if (iter->seq)
finish_chunk(stream, f, iter);
@@
-777,7
+771,11
@@
static size_t inflate_chunk(struct iolog_compress *ic, int gz_hdr, FILE *f,
break;
}
break;
}
- return (void *) stream->next_in - ic->buf;
+ ret = (void *) stream->next_in - ic->buf;
+
+ dprint(FD_COMPRESS, "inflated to size=%lu\n", (unsigned long) ret);
+
+ return ret;
}
/*
}
/*
@@
-798,6
+796,9
@@
static int inflate_gz_chunks(struct io_log *log, FILE *f)
if (log->log_gz_store) {
size_t ret;
if (log->log_gz_store) {
size_t ret;
+ dprint(FD_COMPRESS, "log write chunk size=%lu, "
+ "seq=%u\n", (unsigned long) ic->len, ic->seq);
+
ret = fwrite(ic->buf, ic->len, 1, f);
if (ret != 1 || ferror(f)) {
iter.err = errno;
ret = fwrite(ic->buf, ic->len, 1, f);
if (ret != 1 || ferror(f)) {
iter.err = errno;
@@
-870,18
+871,18
@@
int iolog_file_inflate(const char *file)
*/
total = ic.len;
do {
*/
total = ic.len;
do {
- size_t ret;
+ size_t
i
ret;
- ret = inflate_chunk(&ic, 1, stdout, &stream, &iter);
- total -= ret;
+
i
ret = inflate_chunk(&ic, 1, stdout, &stream, &iter);
+ total -=
i
ret;
if (!total)
break;
if (iter.err)
break;
ic.seq++;
if (!total)
break;
if (iter.err)
break;
ic.seq++;
- ic.len -= ret;
- ic.buf += ret;
+ ic.len -=
i
ret;
+ ic.buf +=
i
ret;
} while (1);
if (iter.seq) {
} while (1);
if (iter.seq) {
@@
-897,6
+898,13
@@
int iolog_file_inflate(const char *file)
static int inflate_gz_chunks(struct io_log *log, FILE *f)
{
static int inflate_gz_chunks(struct io_log *log, FILE *f)
{
+ return 0;
+}
+
+int iolog_file_inflate(const char *file)
+{
+ log_err("fio: log inflation not possible without zlib\n");
+ return 1;
}
#endif
}
#endif
@@
-979,6
+987,8
@@
static int gz_work(struct tp_work *work)
stream.next_in = (void *) data->samples;
stream.avail_in = data->nr_samples * log_entry_sz(data->log);
stream.next_in = (void *) data->samples;
stream.avail_in = data->nr_samples * log_entry_sz(data->log);
+ dprint(FD_COMPRESS, "deflate input size=%lu, seq=%u\n",
+ (unsigned long) stream.avail_in, seq);
do {
c = get_new_chunk(seq);
stream.avail_out = GZ_CHUNK;
do {
c = get_new_chunk(seq);
stream.avail_out = GZ_CHUNK;
@@
-1008,10
+1018,13
@@
static int gz_work(struct tp_work *work)
stream.next_out = c->buf;
ret = deflate(&stream, Z_FINISH);
c->len = GZ_CHUNK - stream.avail_out;
stream.next_out = c->buf;
ret = deflate(&stream, Z_FINISH);
c->len = GZ_CHUNK - stream.avail_out;
+ total += c->len;
flist_add_tail(&c->list, &list);
} while (ret != Z_STREAM_END);
}
flist_add_tail(&c->list, &list);
} while (ret != Z_STREAM_END);
}
+ dprint(FD_COMPRESS, "deflated to size=%lu\n", (unsigned long) total);
+
ret = deflateEnd(&stream);
if (ret != Z_OK)
log_err("fio: deflateEnd %d\n", ret);
ret = deflateEnd(&stream);
if (ret != Z_OK)
log_err("fio: deflateEnd %d\n", ret);
@@
-1080,6
+1093,7
@@
int iolog_flush(struct io_log *log, int wait)
} else
data->work.wait = 0;
} else
data->work.wait = 0;
+ data->work.prio = 1;
tp_queue_work(tdat, &data->work);
if (wait) {
tp_queue_work(tdat, &data->work);
if (wait) {