projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Shorten 'commitrate' to 'CR'
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index dd52626469a0358cdbacc062d02058b19f148825..225aaa4d4550c2ea385f8eaaee70b9b8d1bc321d 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-47,11
+47,17
@@
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;
#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
+66,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
+80,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
+138,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;
@@
-440,8
+448,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;
}
@@
-730,7
+738,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);
@@
-805,7
+813,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
);
}
/*
}
/*
@@
-827,6
+835,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;
@@
-836,10
+845,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
+859,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
+924,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;
@@
-990,7
+1001,9
@@
int main(int argc, char *argv[])
disk_util_timer_arm();
run_threads();
disk_util_timer_arm();
run_threads();
- show_run_stats();
+
+ if (!fio_abort)
+ show_run_stats();
return 0;
}
return 0;
}