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,
- 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,
static void iolog_delay(struct thread_data *td, unsigned long delay)
{
- unsigned long usec = utime_since_now(&td->last_issue);
- unsigned long this_delay;
+ uint64_t usec = utime_since_now(&td->last_issue);
+ uint64_t this_delay;
+ struct timeval tv;
+ if (delay < td->time_offset) {
+ td->time_offset = 0;
+ return;
+ }
+
+ delay -= td->time_offset;
if (delay < usec)
return;
delay -= usec;
- /*
- * less than 100 usec delay, just regard it as noise
- */
- if (delay < 100)
- return;
-
+ fio_gettime(&tv, NULL);
while (delay && !td->terminate) {
this_delay = delay;
if (this_delay > 500000)
usec_sleep(td, this_delay);
delay -= this_delay;
}
+
+ usec = utime_since_now(&tv);
+ if (usec > delay)
+ td->time_offset = usec - delay;
+ else
+ td->time_offset = 0;
}
static int ipo_special(struct thread_data *td, struct io_piece *ipo)
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);
while (!flist_empty(&td->io_log_list)) {
int ret;
- ipo = flist_entry(td->io_log_list.next, struct io_piece, list);
+ ipo = flist_first_entry(&td->io_log_list, struct io_piece, list);
flist_del(&ipo->list);
remove_trim_entry(td, ipo);
}
while (!flist_empty(&td->io_hist_list)) {
- ipo = flist_entry(td->io_hist_list.next, 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--;
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;
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;
stream->opaque = Z_NULL;
stream->next_in = Z_NULL;
+ /*
+ * zlib magic - add 32 for auto-detection of gz header or not,
+ * if we decide to store files in a gzip friendly format.
+ */
if (gz_hdr)
wbits += 32;
return 0;
}
-struct flush_chunk_iter {
+struct inflate_chunk_iter {
unsigned int seq;
+ int err;
void *buf;
size_t buf_size;
size_t buf_used;
};
static void finish_chunk(z_stream *stream, FILE *f,
- struct flush_chunk_iter *iter)
+ struct inflate_chunk_iter *iter)
{
int ret;
iter->buf_size = iter->buf_used = 0;
}
-static int flush_chunk(struct iolog_compress *ic, int gz_hdr, FILE *f,
- z_stream *stream, struct flush_chunk_iter *iter)
+/*
+ * Iterative chunk inflation. Handles cases where we cross into a new
+ * sequence, doing flush finish of previous chunk if needed.
+ */
+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);
err = inflate(stream, Z_NO_FLUSH);
if (err < 0) {
log_err("fio: failed inflating log: %d\n", err);
+ iter->err = err;
break;
}
break;
}
- return 0;
+ ret = (void *) stream->next_in - ic->buf;
+
+ dprint(FD_COMPRESS, "inflated to size=%lu\n", (unsigned long) ret);
+
+ return ret;
}
-static void flush_gz_chunks(struct io_log *log, FILE *f)
+/*
+ * Inflate stored compressed chunks, or write them directly to the log
+ * file if so instructed.
+ */
+static int inflate_gz_chunks(struct io_log *log, FILE *f)
{
- struct flush_chunk_iter iter = { .chunk_sz = log->log_gz, };
- struct flist_head *node;
+ struct inflate_chunk_iter iter = { .chunk_sz = log->log_gz, };
z_stream stream;
while (!flist_empty(&log->chunk_list)) {
struct iolog_compress *ic;
- node = log->chunk_list.next;
- ic = flist_entry(node, struct iolog_compress, list);
+ ic = flist_first_entry(&log->chunk_list, struct iolog_compress, list);
flist_del(&ic->list);
- if (log->log_gz_store)
- fwrite(ic->buf, ic->len, 1, f);
- else
- flush_chunk(ic, log->log_gz_store, f, &stream, &iter);
+ 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;
+ log_err("fio: error writing compressed log\n");
+ }
+ } else
+ inflate_chunk(ic, log->log_gz_store, f, &stream, &iter);
free_chunk(ic);
}
finish_chunk(&stream, f, &iter);
free(iter.buf);
}
+
+ return iter.err;
}
+/*
+ * Open compressed log file and decompress the stored chunks and
+ * write them to stdout. The chunks are stored sequentially in the
+ * file, so we iterate over them and do them one-by-one.
+ */
int iolog_file_inflate(const char *file)
{
- struct flush_chunk_iter iter = { .chunk_sz = 64 * 1024 * 1024, };
+ struct inflate_chunk_iter iter = { .chunk_sz = 64 * 1024 * 1024, };
struct iolog_compress ic;
z_stream stream;
struct stat sb;
ssize_t ret;
+ size_t total;
+ void *buf;
FILE *f;
f = fopen(file, "r");
return 1;
}
- ic.buf = malloc(sb.st_size);
+ ic.buf = buf = malloc(sb.st_size);
ic.len = sb.st_size;
ic.seq = 1;
fclose(f);
- flush_chunk(&ic, 1, stdout, &stream, &iter);
+ /*
+ * Each chunk will return Z_STREAM_END. We don't know how many
+ * chunks are in the file, so we just keep looping and incrementing
+ * the sequence number until we have consumed the whole compressed
+ * file.
+ */
+ total = ic.len;
+ do {
+ size_t iret;
+
+ iret = inflate_chunk(&ic, 1, stdout, &stream, &iter);
+ total -= iret;
+ if (!total)
+ break;
+ if (iter.err)
+ break;
+
+ ic.seq++;
+ ic.len -= iret;
+ ic.buf += iret;
+ } while (1);
if (iter.seq) {
finish_chunk(&stream, stdout, &iter);
free(iter.buf);
}
- free(ic.buf);
- return 0;
+ free(buf);
+ return iter.err;
}
#else
-static void flush_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
buf = set_file_buffer(f);
- flush_gz_chunks(log, f);
+ inflate_gz_chunks(log, f);
flush_samples(f, log->log, log->nr_samples * log_entry_sz(log));
#ifdef CONFIG_ZLIB
+/*
+ * Invoked from our compress helper thread, when logging would have exceeded
+ * the specified memory limitation. Compresses the previously stored
+ * entries.
+ */
static int gz_work(struct tp_work *work)
{
struct iolog_flush_data *data;
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;
ret = deflate(&stream, Z_NO_FLUSH);
if (ret < 0) {
log_err("fio: deflate log (%d)\n", ret);
- break;
+ free_chunk(c);
+ goto err;
}
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);
}
+ 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);
pthread_mutex_unlock(&data->log->chunk_lock);
}
+ ret = 0;
+done:
if (work->wait) {
work->done = 1;
pthread_cond_signal(&work->cv);
} else
free(data);
- return 0;
+ return ret;
+err:
+ while (!flist_empty(&list)) {
+ c = flist_first_entry(list.next, struct iolog_compress, list);
+ flist_del(&c->list);
+ free_chunk(c);
+ }
+ ret = 1;
+ goto done;
}
+/*
+ * Queue work item to compress the existing log entries. We copy the
+ * samples, and reset the log sample count to 0 (so the logging will
+ * continue to use the memory associated with the log). If called with
+ * wait == 1, will not return until the log compression has completed.
+ */
int iolog_flush(struct io_log *log, int wait)
{
struct tp_data *tdat = log->td->tp_data;
} else
data->work.wait = 0;
+ data->work.prio = 1;
tp_queue_work(tdat, &data->work);
if (wait) {
projects / fio.git / blobdiff