#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/ipc.h>
-#ifndef FIO_NO_HAVE_SHM_H
-#include <sys/shm.h>
-#endif
#include <sys/mman.h>
#include "fio.h"
+#ifndef FIO_NO_HAVE_SHM_H
+#include <sys/shm.h>
+#endif
#include "hash.h"
#include "smalloc.h"
#include "verify.h"
return 0;
}
+static int fio_file_fsync(struct thread_data *td, struct fio_file *f)
+{
+ int ret;
+
+ if (fio_file_open(f))
+ return fio_io_sync(td, f);
+
+ if (td_io_open_file(td, f))
+ return 1;
+
+ ret = fio_io_sync(td, f);
+ td_io_close_file(td, f);
+ return ret;
+}
+
static inline void __update_tv_cache(struct thread_data *td)
{
fio_gettime(&td->tv_cache, NULL);
return 0;
}
+static void check_update_rusage(struct thread_data *td)
+{
+ if (td->update_rusage) {
+ td->update_rusage = 0;
+ update_rusage_stat(td);
+ fio_mutex_up(td->rusage_sem);
+ }
+}
+
/*
* The main verify engine. Runs over the writes we previously submitted,
* reads the blocks back in, and checks the crc/md5 of the data.
break;
}
+ check_update_rusage(td);
+
if (td->error)
return;
int ret2, full;
update_tv_cache(td);
+ check_update_rusage(td);
if (runtime_exceeded(td, &td->tv_cache)) {
__update_tv_cache(td);
break;
}
+ check_update_rusage(td);
+
if (!td->error) {
min_events = td->cur_depth;
int ret2, full;
enum fio_ddir ddir;
+ check_update_rusage(td);
+
if (td->terminate || td->done)
break;
}
}
+ check_update_rusage(td);
+
if (td->trim_entries)
- log_err("fio: %d trim entries leaked?\n", td->trim_entries);
+ log_err("fio: %lu trim entries leaked?\n", td->trim_entries);
if (td->o.fill_device && td->error == ENOSPC) {
td->error = 0;
td_set_runstate(td, TD_FSYNCING);
for_each_file(td, f, i) {
- if (!fio_file_open(f))
+ if (!fio_file_fsync(td, f))
continue;
- fio_io_sync(td, f);
+
+ log_err("fio: end_fsync failed for file %s\n",
+ f->file_name);
}
}
} else
char *p;
max_units = td->o.iodepth;
- max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
- max_bs = max(td->o.max_bs[DDIR_TRIM], max_bs);
+ max_bs = td_max_bs(td);
min_write = td->o.min_bs[DDIR_WRITE];
td->orig_buffer_size = (unsigned long long) max_bs
* (unsigned long long) max_units;
return 1;
}
- if (ddir_rw_sum(td->io_bytes) < td->o.size) {
+ if (td->o.size != -1ULL && ddir_rw_sum(td->io_bytes) < td->o.size) {
uint64_t diff;
/*
* are done.
*/
diff = td->o.size - ddir_rw_sum(td->io_bytes);
- if (diff < td->o.rw_min_bs)
+ if (diff < td_max_bs(td))
return 0;
return 1;
} else
td->pid = gettid();
- fio_local_clock_init(td->o.use_thread);
+ fio_local_clock_init(o->use_thread);
dprint(FD_PROCESS, "jobs pid=%d started\n", (int) td->pid);
#ifdef CONFIG_LIBNUMA
/* numa node setup */
- if (td->o.numa_cpumask_set || td->o.numa_memmask_set) {
+ if (o->numa_cpumask_set || o->numa_memmask_set) {
int ret;
if (numa_available() < 0) {
goto err;
}
- if (td->o.numa_cpumask_set) {
- ret = numa_run_on_node_mask(td->o.numa_cpunodesmask);
+ if (o->numa_cpumask_set) {
+ ret = numa_run_on_node_mask(o->numa_cpunodesmask);
if (ret == -1) {
td_verror(td, errno, \
"numa_run_on_node_mask failed\n");
}
}
- if (td->o.numa_memmask_set) {
+ if (o->numa_memmask_set) {
- switch (td->o.numa_mem_mode) {
+ switch (o->numa_mem_mode) {
case MPOL_INTERLEAVE:
- numa_set_interleave_mask(td->o.numa_memnodesmask);
+ numa_set_interleave_mask(o->numa_memnodesmask);
break;
case MPOL_BIND:
- numa_set_membind(td->o.numa_memnodesmask);
+ numa_set_membind(o->numa_memnodesmask);
break;
case MPOL_LOCAL:
numa_set_localalloc();
break;
case MPOL_PREFERRED:
- numa_set_preferred(td->o.numa_mem_prefer_node);
+ numa_set_preferred(o->numa_mem_prefer_node);
break;
case MPOL_DEFAULT:
default:
}
#endif
+ if (fio_pin_memory(td))
+ goto err;
+
/*
* May alter parameters that init_io_u() will use, so we need to
* do this first.
}
}
- if (td->o.cgroup && cgroup_setup(td, cgroup_list, &cgroup_mnt))
+ if (o->cgroup && cgroup_setup(td, cgroup_list, &cgroup_mnt))
goto err;
errno = 0;
memcpy(&td->iops_sample_time, &td->start, sizeof(td->start));
memcpy(&td->tv_cache, &td->start, sizeof(td->start));
- if (td->o.ratemin[DDIR_READ] || td->o.ratemin[DDIR_WRITE] ||
- td->o.ratemin[DDIR_TRIM]) {
+ if (o->ratemin[DDIR_READ] || o->ratemin[DDIR_WRITE] ||
+ o->ratemin[DDIR_TRIM]) {
memcpy(&td->lastrate[DDIR_READ], &td->bw_sample_time,
sizeof(td->bw_sample_time));
memcpy(&td->lastrate[DDIR_WRITE], &td->bw_sample_time,
if (td->error || td->terminate)
break;
- if (!td->o.do_verify ||
- td->o.verify == VERIFY_NONE ||
+ if (!o->do_verify ||
+ o->verify == VERIFY_NONE ||
(td->io_ops->flags & FIO_UNIDIR))
continue;
fio_mutex_down(writeout_mutex);
if (td->bw_log) {
- if (td->o.bw_log_file) {
+ if (o->bw_log_file) {
finish_log_named(td, td->bw_log,
- td->o.bw_log_file, "bw");
+ o->bw_log_file, "bw");
} else
finish_log(td, td->bw_log, "bw");
}
if (td->lat_log) {
- if (td->o.lat_log_file) {
+ if (o->lat_log_file) {
finish_log_named(td, td->lat_log,
- td->o.lat_log_file, "lat");
+ o->lat_log_file, "lat");
} else
finish_log(td, td->lat_log, "lat");
}
if (td->slat_log) {
- if (td->o.lat_log_file) {
+ if (o->lat_log_file) {
finish_log_named(td, td->slat_log,
- td->o.lat_log_file, "slat");
+ o->lat_log_file, "slat");
} else
finish_log(td, td->slat_log, "slat");
}
if (td->clat_log) {
- if (td->o.lat_log_file) {
+ if (o->lat_log_file) {
finish_log_named(td, td->clat_log,
- td->o.lat_log_file, "clat");
+ o->lat_log_file, "clat");
} else
finish_log(td, td->clat_log, "clat");
}
if (td->iops_log) {
- if (td->o.iops_log_file) {
+ if (o->iops_log_file) {
finish_log_named(td, td->iops_log,
- td->o.iops_log_file, "iops");
+ o->iops_log_file, "iops");
} else
finish_log(td, td->iops_log, "iops");
}
fio_mutex_up(writeout_mutex);
- if (td->o.exec_postrun)
- exec_string(td->o.exec_postrun);
+ if (o->exec_postrun)
+ exec_string(o->exec_postrun);
if (exitall_on_terminate)
fio_terminate_threads(td->groupid);
log_info("fio: pid=%d, err=%d/%s\n", (int) td->pid, td->error,
td->verror);
- if (td->o.verify_async)
+ if (o->verify_async)
verify_async_exit(td);
close_and_free_files(td);
/*
* do this very late, it will log file closing as well
*/
- if (td->o.write_iolog_file)
+ if (o->write_iolog_file)
write_iolog_close(td);
+ fio_mutex_remove(td->rusage_sem);
+ td->rusage_sem = NULL;
+
td_set_runstate(td, TD_EXITED);
return (void *) (uintptr_t) td->error;
}
init_disk_util(td);
+ td->rusage_sem = fio_mutex_init(FIO_MUTEX_LOCKED);
+ td->update_rusage = 0;
+
/*
* Set state to created. Thread will transition
* to TD_INITIALIZED when it's done setting up.