#include <sys/mman.h>
#include "fio.h"
+#include "hash.h"
unsigned long page_mask;
unsigned long page_size;
for_each_td(td, i) {
if (group_id == TERMINATE_ALL || groupid == td->groupid) {
- if (td->runstate <= TD_RUNNING)
+ /*
+ * if the thread is running, just let it exit
+ */
+ if (td->runstate < TD_RUNNING)
kill(td->pid, SIGQUIT);
td->terminate = 1;
td->o.start_delay = 0;
if (runtime_exceeded(td, &io_u->start_time)) {
put_io_u(td, io_u);
+ td->terminate = 1;
break;
}
if (runtime_exceeded(td, &s)) {
put_io_u(td, io_u);
+ td->terminate = 1;
break;
}
/*
* "randomly" fill the buffer contents
*/
-static void fill_rand_buf(struct io_u *io_u, int max_bs)
+static void fill_io_buf(struct thread_data *td, struct io_u *io_u, int max_bs)
{
- int *ptr = io_u->buf;
+ long *ptr = io_u->buf;
- while ((void *) ptr - io_u->buf < max_bs) {
- *ptr = rand() * 0x9e370001;
- ptr++;
- }
+ if (!td->o.zero_buffers) {
+ while ((void *) ptr - io_u->buf < max_bs) {
+ *ptr = rand() * GOLDEN_RATIO_PRIME;
+ ptr++;
+ }
+ } else
+ memset(ptr, 0, max_bs);
}
static int init_io_u(struct thread_data *td)
p = ALIGN(td->orig_buffer);
for (i = 0; i < max_units; i++) {
+ if (td->terminate)
+ return 1;
io_u = malloc(sizeof(*io_u));
memset(io_u, 0, sizeof(*io_u));
INIT_LIST_HEAD(&io_u->list);
io_u->buf = p + max_bs * i;
- if (td_write(td) || td_rw(td))
- fill_rand_buf(io_u, max_bs);
+
+ if (td_write(td))
+ fill_io_buf(td, io_u, max_bs);
io_u->index = i;
io_u->flags = IO_U_F_FREE;
INIT_LIST_HEAD(&td->io_hist_list);
td->io_hist_tree = RB_ROOT;
+ td_set_runstate(td, TD_INITIALIZED);
+ fio_sem_up(startup_sem);
+ fio_sem_down(td->mutex);
+
+ /*
+ * the ->mutex semaphore is now no longer used, close it to avoid
+ * eating a file descriptor
+ */
+ fio_sem_remove(td->mutex);
+
+ /*
+ * May alter parameters that init_io_u() will use, so we need to
+ * do this first.
+ */
+ if (init_iolog(td))
+ goto err;
+
if (init_io_u(td))
- goto err_sem;
+ goto err;
if (fio_setaffinity(td) == -1) {
td_verror(td, errno, "cpu_set_affinity");
- goto err_sem;
+ goto err;
}
- if (init_iolog(td))
- goto err_sem;
-
if (td->ioprio) {
if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
td_verror(td, errno, "ioprio_set");
- goto err_sem;
+ goto err;
}
}
if (nice(td->o.nice) == -1) {
td_verror(td, errno, "nice");
- goto err_sem;
+ goto err;
}
if (td->o.ioscheduler && switch_ioscheduler(td))
- goto err_sem;
-
- td_set_runstate(td, TD_INITIALIZED);
- fio_sem_up(startup_sem);
- fio_sem_down(td->mutex);
-
- /*
- * the ->mutex semaphore is now no longer used, close it to avoid
- * eating a file descriptor
- */
- fio_sem_remove(td->mutex);
+ goto err;
if (!td->o.create_serialize && setup_files(td))
goto err;
runtime[0] = runtime[1] = 0;
clear_state = 0;
- while (td->o.loops--) {
+ while (td->o.time_based || td->o.loops--) {
fio_gettime(&td->start, NULL);
memcpy(&td->ts.stat_sample_time, &td->start, sizeof(td->start));
options_mem_free(td);
td_set_runstate(td, TD_EXITED);
return (void *) (unsigned long) td->error;
-err_sem:
- fio_sem_up(startup_sem);
- goto err;
}
/*