projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forced kill is not used anymore.
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index b095527e4d028d18ab30d185a7b25c4a93eba7ab..bf903d92c0c912aa05e8a3ecbe4e47bbc53f712c 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-60,17
+60,16
@@
static inline void td_set_runstate(struct thread_data *td, int runstate)
td->runstate = runstate;
}
td->runstate = runstate;
}
-static void terminate_threads(int group_id
, int forced_kill
)
+static void terminate_threads(int group_id)
{
struct thread_data *td;
int i;
for_each_td(td, i) {
if (group_id == TERMINATE_ALL || groupid == td->groupid) {
{
struct thread_data *td;
int i;
for_each_td(td, i) {
if (group_id == TERMINATE_ALL || groupid == td->groupid) {
+ kill(td->pid, SIGQUIT);
td->terminate = 1;
td->start_delay = 0;
td->terminate = 1;
td->start_delay = 0;
- if (forced_kill)
- td_set_runstate(td, TD_EXITED);
}
}
}
}
}
}
@@
-86,7
+85,7
@@
static void sig_handler(int sig)
default:
printf("\nfio: terminating on signal %d\n", sig);
fflush(stdout);
default:
printf("\nfio: terminating on signal %d\n", sig);
fflush(stdout);
- terminate_threads(TERMINATE_ALL
, 0
);
+ terminate_threads(TERMINATE_ALL);
break;
}
}
break;
}
}
@@
-100,6
+99,12
@@
static int check_min_rate(struct thread_data *td, struct timeval *now)
unsigned long spent;
unsigned long rate;
unsigned long spent;
unsigned long rate;
+ /*
+ * No minimum rate set, always ok
+ */
+ if (!td->ratemin)
+ return 0;
+
/*
* allow a 2 second settle period in the beginning
*/
/*
* allow a 2 second settle period in the beginning
*/
@@
-237,7
+242,7
@@
requeue:
}
/*
}
/*
- * The main verify engine. Runs over the writes we previusly submitted,
+ * The main verify engine. Runs over the writes we previ
o
usly submitted,
* reads the blocks back in, and checks the crc/md5 of the data.
*/
static void do_verify(struct thread_data *td)
* reads the blocks back in, and checks the crc/md5 of the data.
*/
static void do_verify(struct thread_data *td)
@@
-264,6
+269,8
@@
static void do_verify(struct thread_data *td)
io_u = NULL;
while (!td->terminate) {
io_u = NULL;
while (!td->terminate) {
+ int ret2;
+
io_u = __get_io_u(td);
if (!io_u)
break;
io_u = __get_io_u(td);
if (!io_u)
break;
@@
-291,7
+298,7
@@
requeue:
case FIO_Q_COMPLETED:
if (io_u->error)
ret = -io_u->error;
case FIO_Q_COMPLETED:
if (io_u->error)
ret = -io_u->error;
- if (io_u->xfer_buflen != io_u->resid && io_u->resid) {
+
else
if (io_u->xfer_buflen != io_u->resid && io_u->resid) {
int bytes = io_u->xfer_buflen - io_u->resid;
io_u->xfer_buflen = io_u->resid;
int bytes = io_u->xfer_buflen - io_u->resid;
io_u->xfer_buflen = io_u->resid;
@@
-306,7
+313,9
@@
requeue:
break;
case FIO_Q_BUSY:
requeue_io_u(td, &io_u);
break;
case FIO_Q_BUSY:
requeue_io_u(td, &io_u);
- ret = td_io_commit(td);
+ ret2 = td_io_commit(td);
+ if (ret2 < 0)
+ ret = ret2;
break;
default:
assert(ret < 0);
break;
default:
assert(ret < 0);
@@
-390,6
+399,7
@@
static void do_io(struct thread_data *td)
long bytes_done = 0;
int min_evts = 0;
struct io_u *io_u;
long bytes_done = 0;
int min_evts = 0;
struct io_u *io_u;
+ int ret2;
if (td->terminate)
break;
if (td->terminate)
break;
@@
-409,11
+419,9
@@
requeue:
switch (ret) {
case FIO_Q_COMPLETED:
switch (ret) {
case FIO_Q_COMPLETED:
- if (io_u->error) {
- ret = io_u->error;
- break;
- }
- if (io_u->xfer_buflen != io_u->resid && io_u->resid) {
+ if (io_u->error)
+ ret = -io_u->error;
+ else if (io_u->xfer_buflen != io_u->resid && io_u->resid) {
int bytes = io_u->xfer_buflen - io_u->resid;
io_u->xfer_buflen = io_u->resid;
int bytes = io_u->xfer_buflen - io_u->resid;
io_u->xfer_buflen = io_u->resid;
@@
-436,7
+444,9
@@
requeue:
break;
case FIO_Q_BUSY:
requeue_io_u(td, &io_u);
break;
case FIO_Q_BUSY:
requeue_io_u(td, &io_u);
- ret = td_io_commit(td);
+ ret2 = td_io_commit(td);
+ if (ret2 < 0)
+ ret = ret2;
break;
default:
assert(ret < 0);
break;
default:
assert(ret < 0);
@@
-479,7
+489,7
@@
requeue:
if (check_min_rate(td, &comp_time)) {
if (exitall_on_terminate)
if (check_min_rate(td, &comp_time)) {
if (exitall_on_terminate)
- terminate_threads(td->groupid
, 0
);
+ terminate_threads(td->groupid);
td_verror(td, ENODATA, "check_min_rate");
break;
}
td_verror(td, ENODATA, "check_min_rate");
break;
}
@@
-796,7
+806,7
@@
static void *thread_main(void *data)
}
if (exitall_on_terminate)
}
if (exitall_on_terminate)
- terminate_threads(td->groupid
, 0
);
+ terminate_threads(td->groupid);
err:
if (td->error)
err:
if (td->error)
@@
-882,7
+892,8
@@
static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
if (WIFSIGNALED(status)) {
int sig = WTERMSIG(status);
if (WIFSIGNALED(status)) {
int sig = WTERMSIG(status);
- log_err("fio: pid=%d, got signal=%d\n", td->pid, sig);
+ if (sig != SIGQUIT)
+ log_err("fio: pid=%d, got signal=%d\n", td->pid, sig);
td_set_runstate(td, TD_REAPED);
goto reaped;
}
td_set_runstate(td, TD_REAPED);
goto reaped;
}
@@
-916,7
+927,7
@@
reaped:
}
if (*nr_running == cputhreads && !pending)
}
if (*nr_running == cputhreads && !pending)
- terminate_threads(TERMINATE_ALL
, 0
);
+ terminate_threads(TERMINATE_ALL);
}
/*
}
/*