projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Move td_verror() into io_ops->queue() hook
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 28f6376dfeac917305280324aafa822ff9e9e3f8..2aeb6f72a5b196e3052876b27c24fd266db90cfe 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-26,20
+26,19
@@
#include <string.h>
#include <signal.h>
#include <time.h>
#include <string.h>
#include <signal.h>
#include <time.h>
-#include <
assert
.h>
+#include <
locale
.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/ipc.h>
#include <sys/shm.h>
-#include <sys/ioctl.h>
#include <sys/mman.h>
#include "fio.h"
#include "os.h"
#include <sys/mman.h>
#include "fio.h"
#include "os.h"
-#define MASK (4095)
-
-
#define ALIGN(buf) (char *) (((unsigned long) (buf) + MASK) & ~(MASK)
)
+static unsigned long page_mask;
+#define ALIGN(buf) \
+
(char *) (((unsigned long) (buf) + page_mask) & ~page_mask
)
int groupid = 0;
int thread_number = 0;
int groupid = 0;
int thread_number = 0;
@@
-47,11
+46,19
@@
int shm_id = 0;
int temp_stall_ts;
static volatile int startup_sem;
int temp_stall_ts;
static volatile int startup_sem;
+static volatile int fio_abort;
+
+struct io_log *agg_io_log[2];
#define TERMINATE_ALL (-1)
#define JOB_START_TIMEOUT (5 * 1000)
#define TERMINATE_ALL (-1)
#define JOB_START_TIMEOUT (5 * 1000)
-static void terminate_threads(int group_id)
+static inline void td_set_runstate(struct thread_data *td, int runstate)
+{
+ td->runstate = runstate;
+}
+
+static void terminate_threads(int group_id, int forced_kill)
{
struct thread_data *td;
int i;
{
struct thread_data *td;
int i;
@@
-60,6
+67,8
@@
static void terminate_threads(int group_id)
if (group_id == TERMINATE_ALL || groupid == td->groupid) {
td->terminate = 1;
td->start_delay = 0;
if (group_id == TERMINATE_ALL || groupid == td->groupid) {
td->terminate = 1;
td->start_delay = 0;
+ if (forced_kill)
+ td_set_runstate(td, TD_EXITED);
}
}
}
}
}
}
@@
-73,9
+82,9
@@
static void sig_handler(int sig)
print_thread_status();
break;
default:
print_thread_status();
break;
default:
- printf("\nfio: terminating on signal
\n"
);
+ printf("\nfio: terminating on signal
%d\n", sig
);
fflush(stdout);
fflush(stdout);
- terminate_threads(TERMINATE_ALL);
+ terminate_threads(TERMINATE_ALL
, 0
);
break;
}
}
break;
}
}
@@
-125,11
+134,6
@@
static inline int runtime_exceeded(struct thread_data *td, struct timeval *t)
return 0;
}
return 0;
}
-static inline void td_set_runstate(struct thread_data *td, int runstate)
-{
- td->runstate = runstate;
-}
-
static struct fio_file *get_next_file(struct thread_data *td)
{
unsigned int old_next_file = td->next_file;
static struct fio_file *get_next_file(struct thread_data *td)
{
unsigned int old_next_file = td->next_file;
@@
-396,11
+400,21
@@
static void do_io(struct thread_data *td)
memcpy(&s, &io_u->start_time, sizeof(s));
memcpy(&s, &io_u->start_time, sizeof(s));
+requeue:
ret = td_io_queue(td, io_u);
if (ret) {
ret = td_io_queue(td, io_u);
if (ret) {
- td_verror(td, io_u->error);
- put_io_u(td, io_u);
- break;
+ if (ret > 0 && (io_u->xfer_buflen != io_u->resid) &&
+ io_u->resid) {
+ /*
+ * short read/write. requeue.
+ */
+ io_u->xfer_buflen = io_u->resid;
+ io_u->xfer_buf += ret;
+ goto requeue;
+ } else {
+ put_io_u(td, io_u);
+ break;
+ }
}
add_slat_sample(td, io_u->ddir, mtime_since(&io_u->start_time, &io_u->issue_time));
}
add_slat_sample(td, io_u->ddir, mtime_since(&io_u->start_time, &io_u->issue_time));
@@
-440,8
+454,8
@@
static void do_io(struct thread_data *td)
if (check_min_rate(td, &icd.time)) {
if (exitall_on_terminate)
if (check_min_rate(td, &icd.time)) {
if (exitall_on_terminate)
- terminate_threads(td->groupid);
- td_verror(td, ENO
MEM
);
+ terminate_threads(td->groupid
, 0
);
+ td_verror(td, ENO
DATA
);
break;
}
break;
}
@@
-452,7
+466,7
@@
static void do_io(struct thread_data *td)
unsigned long long b;
b = td->io_blocks[0] + td->io_blocks[1];
unsigned long long b;
b = td->io_blocks[0] + td->io_blocks[1];
- if (!(
td->thinktime_blocks % b
))
+ if (!(
b % td->thinktime_blocks
))
usec_sleep(td, td->thinktime);
}
}
usec_sleep(td, td->thinktime);
}
}
@@
-518,7
+532,7
@@
static int init_io_u(struct thread_data *td)
if (td->mem_type == MEM_SHMHUGE || td->mem_type == MEM_MMAPHUGE)
td->orig_buffer_size = (td->orig_buffer_size + td->hugepage_size - 1) & ~(td->hugepage_size - 1);
else
if (td->mem_type == MEM_SHMHUGE || td->mem_type == MEM_MMAPHUGE)
td->orig_buffer_size = (td->orig_buffer_size + td->hugepage_size - 1) & ~(td->hugepage_size - 1);
else
- td->orig_buffer_size +=
MASK
;
+ td->orig_buffer_size +=
page_mask
;
if (allocate_io_mem(td))
return 1;
if (allocate_io_mem(td))
return 1;
@@
-637,9
+651,6
@@
static void *thread_main(void *data)
goto err;
}
goto err;
}
- if (td_io_init(td))
- goto err;
-
if (init_iolog(td))
goto err;
if (init_iolog(td))
goto err;
@@
-670,8
+681,17
@@
static void *thread_main(void *data)
if (open_files(td))
goto err;
if (open_files(td))
goto err;
- if (td->exec_prerun)
- system(td->exec_prerun);
+ /*
+ * Do this late, as some IO engines would like to have the
+ * files setup prior to initializing structures.
+ */
+ if (td_io_init(td))
+ goto err;
+
+ if (td->exec_prerun) {
+ if (system(td->exec_prerun) < 0)
+ goto err;
+ }
fio_gettime(&td->epoch, NULL);
getrusage(RUSAGE_SELF, &td->ru_start);
fio_gettime(&td->epoch, NULL);
getrusage(RUSAGE_SELF, &td->ru_start);
@@
-726,11
+746,13
@@
static void *thread_main(void *data)
finish_log(td, td->clat_log, "clat");
if (td->write_iolog_file)
write_iolog_close(td);
finish_log(td, td->clat_log, "clat");
if (td->write_iolog_file)
write_iolog_close(td);
- if (td->exec_postrun)
- system(td->exec_postrun);
+ if (td->exec_postrun) {
+ if (system(td->exec_postrun) < 0)
+ log_err("fio: postrun %s failed\n", td->exec_postrun);
+ }
if (exitall_on_terminate)
if (exitall_on_terminate)
- terminate_threads(td->groupid);
+ terminate_threads(td->groupid
, 0
);
err:
close_files(td);
err:
close_files(td);
@@
-805,7
+827,7
@@
static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
}
if (*nr_running == cputhreads && !pending)
}
if (*nr_running == cputhreads && !pending)
- terminate_threads(TERMINATE_ALL);
+ terminate_threads(TERMINATE_ALL
, 0
);
}
/*
}
/*
@@
-836,10
+858,10
@@
static void run_threads(void)
for_each_td(td, i) {
print_status_init(td->thread_number - 1);
for_each_td(td, i) {
print_status_init(td->thread_number - 1);
- init_disk_util(td);
-
- if (!td->create_serialize)
+ if (!td->create_serialize) {
+ init_disk_util(td);
continue;
continue;
+ }
/*
* do file setup here so it happens sequentially,
/*
* do file setup here so it happens sequentially,
@@
-850,6
+872,8
@@
static void run_threads(void)
td_set_runstate(td, TD_REAPED);
todo--;
}
td_set_runstate(td, TD_REAPED);
todo--;
}
+
+ init_disk_util(td);
}
while (todo) {
}
while (todo) {
@@
-913,7
+937,7
@@
static void run_threads(void)
*/
fio_gettime(&this_start, NULL);
left = this_jobs;
*/
fio_gettime(&this_start, NULL);
left = this_jobs;
- while (left) {
+ while (left
&& !fio_abort
) {
if (mtime_since_now(&this_start) > JOB_START_TIMEOUT)
break;
if (mtime_since_now(&this_start) > JOB_START_TIMEOUT)
break;
@@
-979,6
+1003,15
@@
static void run_threads(void)
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
+ long ps;
+
+ /*
+ * We need locale for number printing, if it isn't set then just
+ * go with the US format.
+ */
+ if (!getenv("LC_NUMERIC"))
+ setlocale(LC_NUMERIC, "en_US");
+
if (parse_options(argc, argv))
return 1;
if (parse_options(argc, argv))
return 1;
@@
-987,10
+1020,30
@@
int main(int argc, char *argv[])
return 1;
}
return 1;
}
+ ps = sysconf(_SC_PAGESIZE);
+ if (ps < 0) {
+ log_err("Failed to get page size\n");
+ return 1;
+ }
+
+ page_mask = ps - 1;
+
+ if (write_bw_log) {
+ setup_log(&agg_io_log[DDIR_READ]);
+ setup_log(&agg_io_log[DDIR_WRITE]);
+ }
+
disk_util_timer_arm();
run_threads();
disk_util_timer_arm();
run_threads();
- show_run_stats();
+
+ if (!fio_abort) {
+ show_run_stats();
+ if (write_bw_log) {
+ __finish_log(agg_io_log[DDIR_READ],"agg-read_bw.log");
+ __finish_log(agg_io_log[DDIR_WRITE],"agg-write_bw.log");
+ }
+ }
return 0;
}
return 0;
}