projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add 'description' option
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 87136141b0e34770851dbab53a942d9774eb6f48..7ddde7d18561393c692e44a6cc6f6b09e942b3e5 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-47,11
+47,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
+68,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);
}
}
}
}
}
}
@@
-72,10
+82,15
@@
static void sig_handler(int sig)
disk_util_timer_arm();
print_thread_status();
break;
disk_util_timer_arm();
print_thread_status();
break;
+ case SIGSEGV:
+ fprintf(stderr, "fio: got segfault, aborting\n");
+ terminate_threads(TERMINATE_ALL, 1);
+ fio_abort = 1;
+ exit(0);
default:
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
+140,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;
@@
-379,7
+389,6
@@
static void do_io(struct thread_data *td)
td_set_runstate(td, TD_RUNNING);
while (td->this_io_bytes[td->ddir] < td->io_size) {
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;
int min_evts = 0;
struct io_u *io_u;
struct timespec *timeout;
int min_evts = 0;
struct io_u *io_u;
@@
-407,6
+416,8
@@
static void do_io(struct thread_data *td)
add_slat_sample(td, io_u->ddir, mtime_since(&io_u->start_time, &io_u->issue_time));
if (td->cur_depth < td->iodepth) {
add_slat_sample(td, io_u->ddir, mtime_since(&io_u->start_time, &io_u->issue_time));
if (td->cur_depth < td->iodepth) {
+ struct timespec ts = { .tv_sec = 0, .tv_nsec = 0};
+
timeout = &ts;
min_evts = 0;
} else {
timeout = &ts;
min_evts = 0;
} else {
@@
-439,16
+450,21
@@
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;
}
if (runtime_exceeded(td, &icd.time))
break;
break;
}
if (runtime_exceeded(td, &icd.time))
break;
- if (td->thinktime)
- usec_sleep(td, td->thinktime);
+ if (td->thinktime) {
+ unsigned long long b;
+
+ b = td->io_blocks[0] + td->io_blocks[1];
+ if (!(b % td->thinktime_blocks))
+ usec_sleep(td, td->thinktime);
+ }
}
if (!td->error) {
}
if (!td->error) {
@@
-509,8
+525,8
@@
static int init_io_u(struct thread_data *td)
max_bs = max(td->max_bs[DDIR_READ], td->max_bs[DDIR_WRITE]);
td->orig_buffer_size = max_bs * max_units;
max_bs = max(td->max_bs[DDIR_READ], td->max_bs[DDIR_WRITE]);
td->orig_buffer_size = max_bs * max_units;
- if (td->mem_type == MEM_SHMHUGE)
- td->orig_buffer_size = (td->orig_buffer_size +
FIO_HUGE_PAGE - 1) & ~FIO_HUGE_PAGE
;
+ 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;
else
td->orig_buffer_size += MASK;
@@
-631,9
+647,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;
@@
-664,6
+677,13
@@
static void *thread_main(void *data)
if (open_files(td))
goto err;
if (open_files(td))
goto err;
+ /*
+ * 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)
system(td->exec_prerun);
if (td->exec_prerun)
system(td->exec_prerun);
@@
-724,7
+744,7
@@
static void *thread_main(void *data)
system(td->exec_postrun);
if (exitall_on_terminate)
system(td->exec_postrun);
if (exitall_on_terminate)
- terminate_threads(td->groupid);
+ terminate_threads(td->groupid
, 0
);
err:
close_files(td);
err:
close_files(td);
@@
-799,7
+819,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
);
}
/*
}
/*
@@
-821,6
+841,7
@@
static void run_threads(void)
signal(SIGINT, sig_handler);
signal(SIGALRM, sig_handler);
signal(SIGINT, sig_handler);
signal(SIGALRM, sig_handler);
+ signal(SIGSEGV, sig_handler);
todo = thread_number;
nr_running = 0;
todo = thread_number;
nr_running = 0;
@@
-830,10
+851,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,
@@
-844,6
+865,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) {
@@
-907,7
+930,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;
@@
-981,10
+1004,22
@@
int main(int argc, char *argv[])
return 1;
}
return 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;
}