TD_REAPED,
};
-#define should_fsync(td) (td_write(td) && (!(td)->odirect || (td)->override_sync))
+#define should_fsync(td) ((td_write(td) || td_rw(td)) && (!(td)->odirect || (td)->override_sync))
static sem_t startup_sem;
memcpy(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash));
}
+unsigned int hweight32(unsigned int w)
+{
+ unsigned int res = w - ((w >> 1) & 0x55555555);
+
+ res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
+ res = (res + (res >> 4)) & 0x0F0F0F0F;
+ res = res + (res >> 8);
+
+ return (res + (res >> 16)) & 0x000000FF;
+}
+
+unsigned long hweight64(unsigned long long w)
+{
+#if __WORDSIZE == 32
+ return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);
+#elif __WORDSIZE == 64
+ unsigned long long v = w - ((w >> 1) & 0x5555555555555555ul);
+
+ v = (v & 0x3333333333333333ul) + ((v >> 2) & 0x3333333333333333ul);
+ v = (v + (v >> 4)) & 0x0F0F0F0F0F0F0F0Ful;
+ v = v + (v >> 8);
+ v = v + (v >> 16);
+
+ return (v + (v >> 32)) & 0x00000000000000FFul;
+#else
+#error __WORDSIZE not defined
+#endif
+}
+
+static int get_rw_ddir(struct thread_data *td)
+{
+ /*
+ * perhaps cheasy, but use the hamming weight of the position
+ * as a randomizer for data direction.
+ */
+ if (td_rw(td))
+ return hweight64(td->last_pos) & 1;
+ else if (td_read(td))
+ return DDIR_READ;
+ else
+ return DDIR_WRITE;
+}
+
/*
* fill body of io_u->buf with random data and add a header with the
* (eg) sha1sum of that data.
memcpy(io_u->buf, &hdr, sizeof(hdr));
}
-static int td_io_prep(struct thread_data *td, struct io_u *io_u, int read)
+static int td_io_prep(struct thread_data *td, struct io_u *io_u)
{
- if (read)
- io_u->ddir = DDIR_READ;
- else
- io_u->ddir = DDIR_WRITE;
-
if (td->io_prep && td->io_prep(td, io_u))
return 1;
td->cur_depth--;
}
+static int fill_io_u(struct thread_data *td, struct io_u *io_u)
+{
+ /*
+ * If using an iolog, grab next piece if any available.
+ */
+ if (td->iolog) {
+ struct io_piece *ipo;
+
+ if (list_empty(&td->io_log_list))
+ return 1;
+
+ ipo = list_entry(td->io_log_list.next, struct io_piece, list);
+ list_del(&ipo->list);
+ io_u->offset = ipo->offset;
+ io_u->buflen = ipo->len;
+ io_u->ddir = ipo->ddir;
+ free(ipo);
+ return 0;
+ }
+
+ /*
+ * No log, let the seq/rand engine retrieve the next position.
+ */
+ if (!get_next_offset(td, &io_u->offset)) {
+ io_u->buflen = get_next_buflen(td);
+
+ if (io_u->buflen) {
+ io_u->ddir = get_rw_ddir(td);
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
#define queue_full(td) (list_empty(&(td)->io_u_freelist))
struct io_u *__get_io_u(struct thread_data *td)
td->last_pos += td->zone_skip;
}
- if (get_next_offset(td, &io_u->offset)) {
- put_io_u(td, io_u);
- return NULL;
- }
-
- io_u->buflen = get_next_buflen(td);
- if (!io_u->buflen) {
+ if (fill_io_u(td, io_u)) {
put_io_u(td, io_u);
return NULL;
}
return NULL;
}
- if (!td->sequential)
+ if (!td->iolog && !td->sequential)
mark_random_map(td, io_u);
td->last_pos += io_u->buflen;
if (td->verify != VERIFY_NONE)
populate_io_u(td, io_u);
- if (td_io_prep(td, io_u, td_read(td))) {
+ if (td_io_prep(td, io_u)) {
put_io_u(td, io_u);
return NULL;
}
td->runstate = runstate;
}
-static int get_next_verify(struct thread_data *td,
- unsigned long long *offset, unsigned int *len)
+static int get_next_verify(struct thread_data *td, struct io_u *io_u)
{
struct io_piece *ipo;
ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
list_del(&ipo->list);
- *offset = ipo->offset;
- *len = ipo->len;
+ io_u->offset = ipo->offset;
+ io_u->buflen = ipo->len;
+ io_u->ddir = DDIR_READ;
free(ipo);
return 0;
}
list_add(&ipo->list, entry);
}
+static int init_iolog(struct thread_data *td)
+{
+ unsigned long long offset;
+ unsigned int bytes;
+ char *str, *p;
+ FILE *f;
+ int rw, i, reads, writes;
+
+ if (!td->iolog)
+ return 0;
+
+ f = fopen(td->iolog_file, "r");
+ if (!f) {
+ perror("fopen iolog");
+ return 1;
+ }
+
+ str = malloc(4096);
+ reads = writes = i = 0;
+ while ((p = fgets(str, 4096, f)) != NULL) {
+ struct io_piece *ipo;
+
+ if (sscanf(p, "%d,%llu,%u", &rw, &offset, &bytes) != 3) {
+ fprintf(stderr, "bad iolog: %s\n", p);
+ continue;
+ }
+ if (rw == DDIR_READ)
+ reads++;
+ else if (rw == DDIR_WRITE)
+ writes++;
+ else {
+ fprintf(stderr, "bad ddir: %d\n", rw);
+ continue;
+ }
+
+ ipo = malloc(sizeof(*ipo));
+ INIT_LIST_HEAD(&ipo->list);
+ ipo->offset = offset;
+ ipo->len = bytes;
+ if (bytes > td->max_bs)
+ td->max_bs = bytes;
+ ipo->ddir = rw;
+ list_add_tail(&ipo->list, &td->io_log_list);
+ i++;
+ }
+
+ free(str);
+ fclose(f);
+
+ if (!i)
+ return 1;
+
+ if (reads && !writes)
+ td->ddir = DDIR_READ;
+ else if (!reads && writes)
+ td->ddir = DDIR_READ;
+ else
+ td->iomix = 1;
+
+ return 0;
+}
+
static int sync_td(struct thread_data *td)
{
if (td->io_sync)
if (!io_u->error) {
unsigned int bytes = io_u->buflen - io_u->resid;
- int idx = io_u->ddir;
+ const int idx = io_u->ddir;
td->io_blocks[idx]++;
td->io_bytes[idx] += bytes;
msec = mtime_since(&io_u->issue_time, &e);
- add_clat_sample(td, io_u->ddir, msec);
- add_bw_sample(td, io_u->ddir);
+ add_clat_sample(td, idx, msec);
+ add_bw_sample(td, idx);
- if (td_write(td) && io_u->ddir == DDIR_WRITE)
+ if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
log_io_piece(td, io_u);
icd->bytes_done[idx] += bytes;
if (!io_u)
break;
- if (get_next_verify(td, &io_u->offset, &io_u->buflen)) {
+ if (get_next_verify(td, io_u)) {
put_io_u(td, io_u);
break;
}
- if (td_io_prep(td, io_u, 1)) {
+ if (td_io_prep(td, io_u)) {
put_io_u(td, io_u);
break;
}
if (td->cur_depth)
cleanup_pending_aio(td);
- if (should_fsync(td))
+ if (should_fsync(td) && td->fsync_blocks)
sync_td(td);
}
}
}
- INIT_LIST_HEAD(&td->io_u_freelist);
- INIT_LIST_HEAD(&td->io_u_busylist);
- INIT_LIST_HEAD(&td->io_hist_list);
-
p = ALIGN(td->orig_buffer);
for (i = 0; i < max_units; i++) {
io_u = malloc(sizeof(*io_u));
{
int flags;
- if (td_read(td))
- flags = PROT_READ;
- else {
+ if (td_rw(td))
+ flags = PROT_READ | PROT_WRITE;
+ else if (td_write(td)) {
flags = PROT_WRITE;
if (td->verify != VERIFY_NONE)
flags |= PROT_READ;
- }
+ } else
+ flags = PROT_READ;
td->mmap = mmap(NULL, td->file_size, flags, MAP_SHARED, td->fd, td->file_offset);
if (td->mmap == MAP_FAILED) {
if (td->odirect)
flags |= O_DIRECT;
- if (td_read(td)) {
- if (td->filetype == FIO_TYPE_CHAR)
- flags |= O_RDWR;
- else
- flags |= O_RDONLY;
-
- td->fd = open(td->file_name, flags);
- } else {
+ if (td_write(td) || td_rw(td)) {
if (td->filetype == FIO_TYPE_FILE) {
if (!td->overwrite)
flags |= O_TRUNC;
flags |= O_RDWR;
td->fd = open(td->file_name, flags, 0600);
+ } else {
+ if (td->filetype == FIO_TYPE_CHAR)
+ flags |= O_RDWR;
+ else
+ flags |= O_RDONLY;
+
+ td->fd = open(td->file_name, flags);
}
if (td->fd == -1) {
td->pid = getpid();
+ INIT_LIST_HEAD(&td->io_u_freelist);
+ INIT_LIST_HEAD(&td->io_u_busylist);
+ INIT_LIST_HEAD(&td->io_hist_list);
+ INIT_LIST_HEAD(&td->io_log_list);
+
if (init_io_u(td))
goto err;
if (init_io(td))
goto err;
+ if (init_iolog(td))
+ goto err;
+
if (td->ioprio) {
if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
td_verror(td, errno);
do_io(td);
td->runtime[td->ddir] += mtime_since_now(&td->start);
+ if (td_rw(td) && td->io_bytes[td->ddir ^ 1])
+ td->runtime[td->ddir ^ 1] = td->runtime[td->ddir];
+
update_rusage_stat(td);
if (td->error || td->terminate)
printf("Client%d (groupid=%d): err=%2d:\n", td->thread_number, td->groupid, td->error);
show_ddir_status(td, rs, td->ddir);
- show_ddir_status(td, rs, td->ddir ^ 1);
+ if (td->io_bytes[td->ddir ^ 1])
+ show_ddir_status(td, rs, td->ddir ^ 1);
if (td->runtime[0] + td->runtime[1]) {
double runt = td->runtime[0] + td->runtime[1];
c = 'E';
break;
case TD_RUNNING:
- if (td_read(td)) {
+ if (td_rw(td)) {
+ if (td->sequential)
+ c = 'M';
+ else
+ c = 'm';
+ } else if (td_read(td)) {
if (td->sequential)
c = 'R';
else
unsigned int eta_sec = 0;
bytes_total = td->total_io_size;
- if (td->verify)
- bytes_total <<= 1;
+
+ /*
+ * if writing, bytes_total will be twice the size. If mixing,
+ * assume a 50/50 split and thus bytes_total will be 50% larger.
+ */
+ if (td->verify) {
+ if (td_rw(td))
+ bytes_total = bytes_total * 3 / 2;
+ else
+ bytes_total <<= 1;
+ }
if (td->zone_size && td->zone_skip)
bytes_total /= (td->zone_skip / td->zone_size);
projects / fio.git / blobdiff