int shm_id = 0;
static LIST_HEAD(disk_list);
static struct itimerval itimer;
+static struct timeval genesis;
static void update_io_ticks(void);
static void disk_util_timer_arm(void);
return s->tv_sec * 1000 + s->tv_usec / 1000;
}
+static unsigned long time_since_now(struct timeval *s)
+{
+ return mtime_since_now(s) / 1000;
+}
+
static int random_map_free(struct thread_data *td, unsigned long long block)
{
unsigned int idx = RAND_MAP_IDX(td, block);
io_u->buflen = blocks * td->min_bs;
}
-static int get_next_offset(struct thread_data *td, unsigned long long *offset)
-{
- unsigned long long b, rb;
- long r;
-
- if (!td->sequential) {
- unsigned long max_blocks = td->io_size / td->min_bs;
- int loops = 50;
-
- do {
- lrand48_r(&td->random_state, &r);
- b = ((max_blocks - 1) * r / (RAND_MAX+1.0));
- rb = b + (td->file_offset / td->min_bs);
- loops--;
- } while (!random_map_free(td, rb) && loops);
-
- if (!loops) {
- if (get_next_free_block(td, &b))
- return 1;
- }
- } else
- b = td->last_bytes / td->min_bs;
-
- *offset = (b * td->min_bs) + td->file_offset;
- if (*offset > td->file_size)
- return 1;
-
- return 0;
-}
-
-static unsigned int get_next_buflen(struct thread_data *td)
-{
- unsigned int buflen;
- long r;
-
- if (td->min_bs == td->max_bs)
- buflen = td->min_bs;
- else {
- lrand48_r(&td->bsrange_state, &r);
- buflen = (1 + (double) (td->max_bs - 1) * r / (RAND_MAX + 1.0));
- buflen = (buflen + td->min_bs - 1) & ~(td->min_bs - 1);
- }
-
- if (buflen > td->io_size - td->this_io_bytes[td->ddir])
- buflen = td->io_size - td->this_io_bytes[td->ddir];
-
- return buflen;
-}
-
static inline void add_stat_sample(struct io_stat *is, unsigned long val)
{
if (val > is->max_val)
td->stat_io_bytes[ddir] = td->this_io_bytes[ddir];
}
+static int get_next_offset(struct thread_data *td, unsigned long long *offset)
+{
+ unsigned long long b, rb;
+ long r;
+
+ if (!td->sequential) {
+ unsigned long max_blocks = td->io_size / td->min_bs;
+ int loops = 50;
+
+ do {
+ lrand48_r(&td->random_state, &r);
+ b = ((max_blocks - 1) * r / (RAND_MAX+1.0));
+ rb = b + (td->file_offset / td->min_bs);
+ loops--;
+ } while (!random_map_free(td, rb) && loops);
+
+ if (!loops) {
+ if (get_next_free_block(td, &b))
+ return 1;
+ }
+ } else
+ b = td->last_pos / td->min_bs;
+
+ *offset = (b * td->min_bs) + td->file_offset;
+ if (*offset > td->real_file_size)
+ return 1;
+
+ return 0;
+}
+
+static unsigned int get_next_buflen(struct thread_data *td)
+{
+ unsigned int buflen;
+ long r;
+
+ if (td->min_bs == td->max_bs)
+ buflen = td->min_bs;
+ else {
+ lrand48_r(&td->bsrange_state, &r);
+ buflen = (1 + (double) (td->max_bs - 1) * r / (RAND_MAX + 1.0));
+ buflen = (buflen + td->min_bs - 1) & ~(td->min_bs - 1);
+ }
+
+ if (buflen > td->io_size - td->this_io_bytes[td->ddir])
+ buflen = td->io_size - td->this_io_bytes[td->ddir];
+
+ return buflen;
+}
+
/*
* busy looping version for the last few usec
*/
memcpy(io_u->buf, &hdr, sizeof(hdr));
}
-static void put_io_u(struct thread_data *td, struct io_u *io_u)
+static int td_io_prep(struct thread_data *td, struct io_u *io_u, int read)
+{
+ 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;
+
+ return 0;
+}
+
+void put_io_u(struct thread_data *td, struct io_u *io_u)
{
list_del(&io_u->list);
list_add(&io_u->list, &td->io_u_freelist);
#define queue_full(td) (list_empty(&(td)->io_u_freelist))
-static struct io_u *__get_io_u(struct thread_data *td)
+struct io_u *__get_io_u(struct thread_data *td)
{
struct io_u *io_u;
return io_u;
}
-static int td_io_prep(struct thread_data *td, struct io_u *io_u, int read)
-{
- 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;
-
- return 0;
-}
-
static struct io_u *get_io_u(struct thread_data *td)
{
struct io_u *io_u;
if (!io_u)
return NULL;
+ if (td->zone_bytes >= td->zone_size) {
+ td->zone_bytes = 0;
+ td->last_pos += td->zone_skip;
+ }
+
if (get_next_offset(td, &io_u->offset)) {
put_io_u(td, io_u);
return NULL;
return NULL;
}
- if (io_u->buflen + io_u->offset > td->file_size)
- io_u->buflen = td->file_size - io_u->offset;
+ if (io_u->buflen + io_u->offset > td->real_file_size)
+ io_u->buflen = td->real_file_size - io_u->offset;
if (!io_u->buflen) {
put_io_u(td, io_u);
if (!td->sequential)
mark_random_map(td, io_u);
- td->last_bytes += io_u->buflen;
+ td->last_pos += io_u->buflen;
if (td->verify != VERIFY_NONE)
populate_io_u(td, io_u);
gettimeofday(&e, NULL);
if (!io_u->error) {
+ unsigned int bytes = io_u->buflen - io_u->resid;
int idx = io_u->ddir;
td->io_blocks[idx]++;
- td->io_bytes[idx] += (io_u->buflen - io_u->resid);
- td->this_io_bytes[idx] += (io_u->buflen - io_u->resid);
+ td->io_bytes[idx] += bytes;
+ td->zone_bytes += bytes;
+ td->this_io_bytes[idx] += bytes;
msec = mtime_since(&io_u->issue_time, &e);
if (td_write(td) && io_u->ddir == DDIR_WRITE)
log_io_piece(td, io_u);
- icd->bytes_done[idx] += (io_u->buflen - io_u->resid);
+ icd->bytes_done[idx] += bytes;
} else
icd->error = io_u->error;
}
break;
}
- td->cur_off = v_io_u->offset + v_io_u->buflen;
-
/*
* if we can't submit more io, we need to verify now
*/
INIT_LIST_HEAD(&io_u->list);
io_u->buf = p + td->max_bs * i;
+ io_u->index = i;
list_add(&io_u->list, &td->io_u_freelist);
}
return 1;
}
- if (!td->file_size)
- td->file_size = st.st_size;
+ td->real_file_size = st.st_size;
+
+ if (!td->file_size || td->file_size > td->real_file_size)
+ td->file_size = td->real_file_size;
return 0;
}
static int bdev_size(struct thread_data *td)
{
- size_t bytes;
+ unsigned long long bytes;
int r;
r = blockdev_size(td->fd, &bytes);
return 1;
}
+ td->real_file_size = bytes;
+
/*
* no extend possibilities, so limit size to device size if too large
*/
- if (!td->file_size || td->file_size > bytes)
- td->file_size = bytes;
+ if (!td->file_size || td->file_size > td->real_file_size)
+ td->file_size = td->real_file_size;
return 0;
}
static int get_file_size(struct thread_data *td)
{
- int ret;
+ int ret = 0;
if (td->filetype == FIO_TYPE_FILE)
ret = file_size(td);
- else
+ else if (td->filetype == FIO_TYPE_BD)
ret = bdev_size(td);
+ else
+ td->real_file_size = -1;
if (ret)
return ret;
- if (td->file_offset > td->file_size) {
- fprintf(stderr, "Client%d: offset larger than length (%Lu > %Lu)\n", td->thread_number, td->file_offset, td->file_size);
+ if (td->file_offset + td->file_size > td->real_file_size) {
+ fprintf(stderr, "Client%d: offset extends end (%Lu > %Lu)\n", td->thread_number, td->file_offset + td->file_size, td->real_file_size);
return 1;
}
- td->io_size = td->file_size - td->file_offset;
+ td->io_size = td->file_size;
if (td->io_size == 0) {
fprintf(stderr, "Client%d: no io blocks\n", td->thread_number);
td_verror(td, EINVAL);
return 1;
}
+ if (!td->zone_size)
+ td->zone_size = td->io_size;
+
td->total_io_size = td->io_size * td->loops;
return 0;
}
if (create_file(td, td->file_size, 0))
return 1;
} else if (td->filetype == FIO_TYPE_FILE) {
- if (st.st_size < td->file_size) {
+ if (st.st_size < (off_t) td->file_size) {
if (create_file(td, td->file_size - st.st_size, 1))
return 1;
}
if (td->odirect)
flags |= O_DIRECT;
- if (td_read(td))
- td->fd = open(td->file_name, flags | O_RDONLY);
- else {
+ 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->filetype == FIO_TYPE_FILE) {
if (!td->overwrite)
flags |= O_TRUNC;
return;
/*
- * if this is inside a partition dir, jump back to parent
+ * for md/dm, there's no queue dir. we already have the right place
*/
- sprintf(tmp, "%s/queue", foo);
+ sprintf(tmp, "%s/stat", foo);
if (stat(tmp, &st)) {
- p = dirname(foo);
- sprintf(tmp, "%s/queue", p);
+ /*
+ * if this is inside a partition dir, jump back to parent
+ */
+ sprintf(tmp, "%s/queue", foo);
if (stat(tmp, &st)) {
- fprintf(stderr, "unknown sysfs layout\n");
- return;
+ p = dirname(foo);
+ sprintf(tmp, "%s/queue", p);
+ if (stat(tmp, &st)) {
+ fprintf(stderr, "unknown sysfs layout\n");
+ return;
+ }
+ sprintf(foo, "%s", p);
}
- sprintf(foo, "%s", p);
}
disk_util_add(dev, foo);
if (td->io_engine == FIO_SYNCIO)
lseek(td->fd, SEEK_SET, 0);
- td->cur_off = 0;
- td->last_bytes = 0;
+ td->last_pos = 0;
td->stat_io_bytes[0] = td->stat_io_bytes[1] = 0;
td->this_io_bytes[0] = td->this_io_bytes[1] = 0;
+ td->zone_bytes = 0;
if (td->file_map)
memset(td->file_map, 0, td->num_maps * sizeof(long));
return;
bw = td->io_bytes[ddir] / td->runtime[ddir];
- printf(" %s: io=%6luMiB, bw=%6luKiB/s, runt=%6lumsec\n", ddir_str[ddir], td->io_bytes[ddir] >> 20, bw, td->runtime[ddir]);
+ printf(" %s: io=%6lluMiB, bw=%6luKiB/s, runt=%6lumsec\n", ddir_str[ddir], td->io_bytes[ddir] >> 20, bw, td->runtime[ddir]);
if (calc_lat(&td->slat_stat[ddir], &min, &max, &mean, &dev))
printf(" slat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);
td->old_runstate = td->runstate;
}
+static void eta_to_str(char *str, int eta_sec)
+{
+ unsigned int d, h, m, s;
+ static int always_d, always_h;
+
+ d = h = m = s = 0;
+
+ s = eta_sec % 60;
+ eta_sec /= 60;
+ m = eta_sec % 60;
+ eta_sec /= 60;
+ h = eta_sec % 24;
+ eta_sec /= 24;
+ d = eta_sec;
+
+ if (d || always_d) {
+ always_d = 1;
+ str += sprintf(str, "%02dd:", d);
+ }
+ if (h || always_h) {
+ always_h = 1;
+ str += sprintf(str, "%02dh:", h);
+ }
+
+ str += sprintf(str, "%02dm:", m);
+ str += sprintf(str, "%02ds", s);
+}
+
+static int thread_eta(struct thread_data *td, unsigned long elapsed)
+{
+ unsigned long long bytes_total, bytes_done;
+ unsigned int eta_sec = 0;
+
+ bytes_total = td->total_io_size;
+ if (td->verify)
+ bytes_total <<= 1;
+ if (td->zone_size && td->zone_skip)
+ bytes_total /= (td->zone_skip / td->zone_size);
+
+ if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
+ double perc;
+ bytes_done = td->io_bytes[DDIR_READ] + td->io_bytes[DDIR_WRITE];
+ perc = (double) bytes_done / (double) bytes_total;
+ if (perc > 1.0)
+ perc = 1.0;
+
+ eta_sec = (elapsed * (1.0 / perc)) - elapsed;
+
+ if (eta_sec > (td->timeout - elapsed))
+ eta_sec = td->timeout - elapsed;
+ } else if (td->runstate == TD_NOT_CREATED || td->runstate == TD_CREATED) {
+ int t_eta = 0, r_eta = 0;
+
+ /*
+ * We can only guess - assume it'll run the full timeout
+ * if given, otherwise assume it'll run at the specified rate.
+ */
+ if (td->timeout)
+ t_eta = td->timeout + td->start_delay - elapsed;
+ if (td->rate) {
+ r_eta = (bytes_total / 1024) / td->rate;
+ r_eta += td->start_delay - elapsed;
+ }
+
+ if (r_eta && t_eta)
+ eta_sec = min(r_eta, t_eta);
+ else if (r_eta)
+ eta_sec = r_eta;
+ else if (t_eta)
+ eta_sec = t_eta;
+ else
+ eta_sec = INT_MAX;
+ } else {
+ /*
+ * thread is already done
+ */
+ eta_sec = 0;
+ }
+
+ return eta_sec;
+}
+
static void print_thread_status(void)
{
- unsigned long long bytes_done, bytes_total;
- int i, nr_running, t_rate, m_rate;
- double perc;
+ unsigned long elapsed = time_since_now(&genesis);
+ int i, nr_running, t_rate, m_rate, *eta_secs, eta_sec;
+ char eta_str[32];
+ double perc = 0.0;
+
+ eta_secs = malloc(thread_number * sizeof(int));
+ memset(eta_secs, 0, thread_number * sizeof(int));
- bytes_done = bytes_total = 0;
nr_running = t_rate = m_rate = 0;
for (i = 0; i < thread_number; i++) {
struct thread_data *td = &threads[i];
m_rate += td->ratemin;
}
- bytes_total += td->total_io_size;
- if (td->verify)
- bytes_total += td->total_io_size;
-
- bytes_done += td->io_bytes[DDIR_READ] +td->io_bytes[DDIR_WRITE];
+ if (elapsed >= 3)
+ eta_secs[i] = thread_eta(td, elapsed);
check_str_update(td);
}
- perc = 0;
- if (bytes_total && bytes_done) {
- perc = (double) 100 * bytes_done / (double) bytes_total;
- if (perc > 100.0)
- perc = 100.0;
+ if (exitall_on_terminate)
+ eta_sec = INT_MAX;
+ else
+ eta_sec = 0;
+
+ for (i = 0; i < thread_number; i++) {
+ if (exitall_on_terminate) {
+ if (eta_secs[i] < eta_sec)
+ eta_sec = eta_secs[i];
+ } else {
+ if (eta_secs[i] > eta_sec)
+ eta_sec = eta_secs[i];
+ }
}
- printf("Threads now running: %d", nr_running);
+ if (eta_sec == INT_MAX)
+ eta_sec = 0;
+
+ if (eta_sec) {
+ perc = (double) elapsed / (double) (elapsed + eta_sec);
+ eta_to_str(eta_str, eta_sec);
+ }
+
+ printf("Threads now running (%d)", nr_running);
if (m_rate || t_rate)
printf(", commitrate %d/%dKiB/sec", t_rate, m_rate);
- printf(" : [%s] [%3.2f%% done]\r", run_str, perc);
+ if (eta_sec) {
+ perc *= 100.0;
+ printf(": [%s] [%3.2f%% done] [eta %s]", run_str, perc,eta_str);
+ }
+ printf("\r");
fflush(stdout);
+ free(eta_secs);
}
static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
static void run_threads(void)
{
- struct timeval genesis;
struct thread_data *td;
unsigned long spent;
int i, todo, nr_running, m_rate, t_rate, nr_started;
printf("\nRun status group %d (all jobs):\n", id);
if (rs->max_run[DDIR_READ])
- printf(" READ: io=%luMiB, aggrb=%lu, minb=%lu, maxb=%lu, mint=%lumsec, maxt=%lumsec\n", rs->io_mb[0], rs->agg[0], rs->min_bw[0], rs->max_bw[0], rs->min_run[0], rs->max_run[0]);
+ printf(" READ: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_mb[0], rs->agg[0], rs->min_bw[0], rs->max_bw[0], rs->min_run[0], rs->max_run[0]);
if (rs->max_run[DDIR_WRITE])
- printf(" WRITE: io=%luMiB, aggrb=%lu, minb=%lu, maxb=%lu, mint=%lumsec, maxt=%lumsec\n", rs->io_mb[1], rs->agg[1], rs->min_bw[1], rs->max_bw[1], rs->min_run[1], rs->max_run[1]);
+ printf(" WRITE: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_mb[1], rs->agg[1], rs->min_bw[1], rs->max_bw[1], rs->min_run[1], rs->max_run[1]);
}
static void show_disk_util(void)
projects / fio.git / blobdiff