TD_INITIALIZED,
TD_RUNNING,
TD_VERIFYING,
+ TD_FSYNCING,
TD_EXITED,
TD_REAPED,
};
rate = (td->this_io_bytes[ddir] - td->rate_bytes) / spent;
if (rate < td->ratemin) {
- printf("%s: min rate %d not met, got %ldKiB/sec\n", td->name, td->ratemin, rate);
+ fprintf(f_out, "%s: min rate %d not met, got %ldKiB/sec\n", td->name, td->ratemin, rate);
if (rate_quit)
terminate_threads(td->groupid);
return 1;
int i;
for (i = 0; i < len; i++)
- printf("%02x", p[i]);
- printf("\n");
+ fprintf(f_out, "%02x", p[i]);
+ fprintf(f_out, "\n");
}
static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u)
c = crc32(p, hdr->len - sizeof(*hdr));
if (c != hdr->crc32) {
- fprintf(stderr, "crc32: verify failed at %llu/%u\n", io_u->offset, io_u->buflen);
- fprintf(stderr, "crc32: wanted %lx, got %lx\n", hdr->crc32, c);
+ fprintf(f_err, "crc32: verify failed at %llu/%u\n", io_u->offset, io_u->buflen);
+ fprintf(f_err, "crc32: wanted %lx, got %lx\n", hdr->crc32, c);
return 1;
}
md5_update(&md5_ctx, p, hdr->len - sizeof(*hdr));
if (memcmp(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash))) {
- fprintf(stderr, "md5: verify failed at %llu/%u\n", io_u->offset, io_u->buflen);
+ fprintf(f_err, "md5: verify failed at %llu/%u\n", io_u->offset, io_u->buflen);
hexdump(hdr->md5_digest, sizeof(hdr->md5_digest));
hexdump(md5_ctx.hash, sizeof(md5_ctx.hash));
return 1;
else if (hdr->verify_type == VERIFY_CRC32)
ret = verify_io_u_crc32(hdr, io_u);
else {
- fprintf(stderr, "Bad verify type %d\n", hdr->verify_type);
+ fprintf(f_err, "Bad verify type %d\n", hdr->verify_type);
ret = 1;
}
* Check if it's time to seed a new data direction.
*/
if (elapsed >= td->rwmixcycle) {
- unsigned long v;
+ int v;
long r;
- r = os_random_long(&td->random_state);
- v = 100UL * r / (unsigned long) (RAND_MAX + 1.0);
+ r = os_random_long(&td->rwmix_state);
+ v = 1 + (int) (100.0 * (r / (RAND_MAX + 1.0)));
if (v < td->rwmixread)
td->rwmix_ddir = DDIR_READ;
else
static inline void td_set_runstate(struct thread_data *td, int runstate)
{
- td->old_runstate = td->runstate;
td->runstate = runstate;
}
struct timeval s, e;
unsigned long usec;
+ td_set_runstate(td, TD_RUNNING);
+
while (td->this_io_bytes[td->ddir] < td->io_size) {
struct timespec ts = { .tv_sec = 0, .tv_nsec = 0};
struct timespec *timeout;
if (td->cur_depth)
cleanup_pending_aio(td);
- if (should_fsync(td) && td->end_fsync)
+ if (should_fsync(td) && td->end_fsync) {
+ td_set_runstate(td, TD_FSYNCING);
sync_td(td);
+ }
}
static void cleanup_io(struct thread_data *td)
else if (td->io_engine == FIO_SPLICEIO)
return fio_spliceio_init(td);
else {
- fprintf(stderr, "bad io_engine %d\n", td->io_engine);
+ fprintf(f_err, "bad io_engine %d\n", td->io_engine);
return 1;
}
}
} else if (td->mem_type == MEM_MMAP)
munmap(td->orig_buffer, td->orig_buffer_size);
else
- fprintf(stderr, "Bad memory type %d\n", td->mem_type);
+ fprintf(f_err, "Bad memory type %d\n", td->mem_type);
td->orig_buffer = NULL;
}
return 0;
}
-static void cleanup_allocs(struct thread_data *td)
-{
- if (td->directory)
- free(td->directory);
- if (td->iolog_file)
- free(td->iolog_file);
- if (td->exec_prerun)
- free(td->exec_prerun);
- if (td->exec_postrun)
- free(td->exec_postrun);
- if (td->ioscheduler)
- free(td->ioscheduler);
- if (td->sysfs_root)
- free(td->sysfs_root);
- if (td->file_name)
- free(td->file_name);
-}
-
static int create_file(struct thread_data *td, unsigned long long size,
int extend)
{
return 0;
if (!size) {
- fprintf(stderr, "Need size for create\n");
+ fprintf(f_err, "Need size for create\n");
td_verror(td, EINVAL);
return 1;
}
if (!extend) {
oflags = O_CREAT | O_TRUNC;
- printf("%s: Laying out IO file (%LuMiB)\n", td->name, size >> 20);
+ fprintf(f_out, "%s: Laying out IO file (%LuMiB)\n", td->name, size >> 20);
} else {
oflags = O_APPEND;
- printf("%s: Extending IO file (%Lu -> %LuMiB)\n", td->name, (td->file_size - size) >> 20, td->file_size >> 20);
+ fprintf(f_out, "%s: Extending IO file (%Lu -> %LuMiB)\n", td->name, (td->file_size - size) >> 20, td->file_size >> 20);
}
td->fd = open(td->file_name, O_WRONLY | oflags, 0644);
return ret;
if (td->file_offset > td->real_file_size) {
- fprintf(stderr, "%s: offset extends end (%Lu > %Lu)\n", td->name, td->file_offset, td->real_file_size);
+ fprintf(f_err, "%s: offset extends end (%Lu > %Lu)\n", td->name, td->file_offset, td->real_file_size);
return 1;
}
td->io_size = td->file_size;
if (td->io_size == 0) {
- fprintf(stderr, "%s: no io blocks\n", td->name);
+ fprintf(f_err, "%s: no io blocks\n", td->name);
td_verror(td, EINVAL);
return 1;
}
}
if (td->odirect)
- flags |= O_DIRECT;
+ flags |= OS_O_DIRECT;
if (td_write(td) || td_rw(td)) {
if (td->filetype == FIO_TYPE_FILE) {
sprintf(tmp2, "[%s]", td->ioscheduler);
if (!strstr(tmp, tmp2)) {
- fprintf(stderr, "fio: io scheduler %s not found\n", td->ioscheduler);
+ fprintf(f_err, "fio: io scheduler %s not found\n", td->ioscheduler);
td_verror(td, EINVAL);
fclose(f);
return 1;
}
if (td->mmap)
munmap(td->mmap, td->file_size);
- cleanup_allocs(td);
cleanup_io(td);
cleanup_io_u(td);
td_set_runstate(td, TD_EXITED);
{
char c = run_str[td->thread_number - 1];
- if (td->runstate == td->old_runstate)
- return;
-
switch (td->runstate) {
case TD_REAPED:
c = '_';
case TD_VERIFYING:
c = 'V';
break;
+ case TD_FSYNCING:
+ c = 'F';
+ break;
case TD_CREATED:
c = 'C';
break;
c = 'P';
break;
default:
- printf("state %d\n", td->runstate);
+ fprintf(f_err, "state %d\n", td->runstate);
}
run_str[td->thread_number - 1] = c;
- td->old_runstate = td->runstate;
}
static void eta_to_str(char *str, int eta_sec)
eta_sec = INT_MAX;
} else {
/*
- * thread is already done
+ * thread is already done or waiting for fsync
*/
eta_sec = 0;
}
static void print_thread_status(void)
{
unsigned long elapsed = time_since_now(&genesis);
- int i, nr_running, t_rate, m_rate, *eta_secs, eta_sec;
+ int i, nr_running, nr_pending, 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));
- nr_running = t_rate = m_rate = 0;
+ nr_pending = nr_running = t_rate = m_rate = 0;
for (i = 0; i < thread_number; i++) {
struct thread_data *td = &threads[i];
- if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING){
+ if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING||
+ td->runstate == TD_FSYNCING) {
nr_running++;
t_rate += td->rate;
m_rate += td->ratemin;
- }
+ } else if (td->runstate < TD_RUNNING)
+ nr_pending++;
if (elapsed >= 3)
eta_secs[i] = thread_eta(td, elapsed);
eta_to_str(eta_str, eta_sec);
}
- printf("Threads now running (%d)", nr_running);
+ if (!nr_running && !nr_pending)
+ return;
+
+ printf("Threads running: %d", nr_running);
if (m_rate || t_rate)
printf(", commitrate %d/%dKiB/sec", t_rate, m_rate);
if (eta_sec != INT_MAX) {
if (phys_mem) {
if ((mlock_size + 128 * 1024 * 1024) > phys_mem) {
mlock_size = phys_mem - 128 * 1024 * 1024;
- printf("fio: limiting mlocked memory to %lluMiB\n",
- mlock_size >> 20);
+ fprintf(f_out, "fio: limiting mlocked memory to %lluMiB\n", mlock_size >> 20);
}
}
}
if (left) {
- fprintf(stderr, "fio: %d jobs failed to start\n", left);
+ fprintf(f_err, "fio: %d jobs failed to start\n", left);
for (i = 0; i < this_jobs; i++) {
td = map[i];
if (!td)
return 1;
if (!thread_number) {
- printf("Nothing to do\n");
+ fprintf(f_err, "Nothing to do\n");
return 1;
}
projects / fio.git / blobdiff