projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the file->last_completed_pos variable
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index e71537fc9d45c379d53c001d1ae160e42b6eb435..c2bc1a67625f0d7b991486143dd6bc385472ac78 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-49,7
+49,7
@@
int nr_thread = 0;
int shm_id = 0;
int temp_stall_ts;
int shm_id = 0;
int temp_stall_ts;
-static struct fio_
sem *startup_sem
;
+static struct fio_
mutex *startup_mutex
;
static volatile int fio_abort;
static int exit_value;
static volatile int fio_abort;
static int exit_value;
@@
-60,6
+60,8
@@
struct io_log *agg_io_log[2];
static inline void td_set_runstate(struct thread_data *td, int runstate)
{
static inline void td_set_runstate(struct thread_data *td, int runstate)
{
+ dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", td->pid, td->runstate,
+ runstate);
td->runstate = runstate;
}
td->runstate = runstate;
}
@@
-70,13
+72,22
@@
static void terminate_threads(int group_id)
for_each_td(td, i) {
if (group_id == TERMINATE_ALL || groupid == td->groupid) {
for_each_td(td, i) {
if (group_id == TERMINATE_ALL || groupid == td->groupid) {
+ dprint(FD_PROCESS, "setting terminate on %d\n",td->pid);
+
+ td->terminate = 1;
+ td->o.start_delay = 0;
+
/*
* if the thread is running, just let it exit
*/
if (td->runstate < TD_RUNNING)
kill(td->pid, SIGQUIT);
/*
* 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;
+ else {
+ struct ioengine_ops *ops = td->io_ops;
+
+ if (ops && (ops->flags & FIO_SIGQUIT))
+ kill(td->pid, SIGQUIT);
+ }
}
}
}
}
}
}
@@
-348,7
+359,6
@@
static void do_verify(struct thread_data *td)
io_u->xfer_buflen = io_u->resid;
io_u->xfer_buf += bytes;
io_u->offset += bytes;
io_u->xfer_buflen = io_u->resid;
io_u->xfer_buf += bytes;
io_u->offset += bytes;
- f->last_completed_pos = io_u->offset;
td->ts.short_io_u[io_u->ddir]++;
td->ts.short_io_u[io_u->ddir]++;
@@
-474,7
+484,6
@@
static void do_io(struct thread_data *td)
io_u->xfer_buflen = io_u->resid;
io_u->xfer_buf += bytes;
io_u->offset += bytes;
io_u->xfer_buflen = io_u->resid;
io_u->xfer_buf += bytes;
io_u->offset += bytes;
- f->last_completed_pos = io_u->offset;
td->ts.short_io_u[io_u->ddir]++;
td->ts.short_io_u[io_u->ddir]++;
@@
-568,6
+577,10
@@
sync_done:
}
}
}
}
+ if (td->o.fill_device && td->error == ENOSPC) {
+ td->error = 0;
+ td->terminate = 1;
+ }
if (!td->error) {
struct fio_file *f;
if (!td->error) {
struct fio_file *f;
@@
-586,6
+599,12
@@
sync_done:
}
} else
cleanup_pending_aio(td);
}
} else
cleanup_pending_aio(td);
+
+ /*
+ * stop job if we failed doing any IO
+ */
+ if ((td->this_io_bytes[0] + td->this_io_bytes[1]) == 0)
+ td->done = 1;
}
static void cleanup_io_u(struct thread_data *td)
}
static void cleanup_io_u(struct thread_data *td)
@@
-626,11
+645,7
@@
static int init_io_u(struct thread_data *td)
int i, max_units;
char *p;
int i, max_units;
char *p;
- if (td->io_ops->flags & FIO_SYNCIO)
- max_units = 1;
- else
- max_units = td->o.iodepth;
-
+ max_units = td->o.iodepth;
max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
td->orig_buffer_size = (unsigned long long) max_bs * (unsigned long long) max_units;
max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
td->orig_buffer_size = (unsigned long long) max_bs * (unsigned long long) max_units;
@@
-764,11
+779,13
@@
static int clear_io_state(struct thread_data *td)
td->last_was_sync = 0;
td->last_was_sync = 0;
- if (td->o.time_based)
+ /*
+ * reset file done count if we are to start over
+ */
+ if (td->o.time_based || td->o.loops)
td->nr_done_files = 0;
td->nr_done_files = 0;
- for_each_file(td, f, i)
- td_io_close_file(td, f);
+ close_files(td);
ret = 0;
for_each_file(td, f, i) {
ret = 0;
for_each_file(td, f, i) {
@@
-787,9
+804,8
@@
static int clear_io_state(struct thread_data *td)
*/
static void *thread_main(void *data)
{
*/
static void *thread_main(void *data)
{
- unsigned long long runtime[2];
+ unsigned long long runtime[2]
, elapsed
;
struct thread_data *td = data;
struct thread_data *td = data;
- unsigned long elapsed;
int clear_state;
if (!td->o.use_thread)
int clear_state;
if (!td->o.use_thread)
@@
-797,6
+813,8
@@
static void *thread_main(void *data)
td->pid = getpid();
td->pid = getpid();
+ dprint(FD_PROCESS, "jobs pid=%d started\n", td->pid);
+
INIT_LIST_HEAD(&td->io_u_freelist);
INIT_LIST_HEAD(&td->io_u_busylist);
INIT_LIST_HEAD(&td->io_u_requeues);
INIT_LIST_HEAD(&td->io_u_freelist);
INIT_LIST_HEAD(&td->io_u_busylist);
INIT_LIST_HEAD(&td->io_u_requeues);
@@
-805,14
+823,14
@@
static void *thread_main(void *data)
td->io_hist_tree = RB_ROOT;
td_set_runstate(td, TD_INITIALIZED);
td->io_hist_tree = RB_ROOT;
td_set_runstate(td, TD_INITIALIZED);
- fio_
sem_up(startup_sem
);
- fio_
sem
_down(td->mutex);
+ fio_
mutex_up(startup_mutex
);
+ fio_
mutex
_down(td->mutex);
/*
/*
- * the ->mutex
semaphore
is now no longer used, close it to avoid
+ * the ->mutex
mutex
is now no longer used, close it to avoid
* eating a file descriptor
*/
* eating a file descriptor
*/
- fio_
sem
_remove(td->mutex);
+ fio_
mutex
_remove(td->mutex);
/*
* May alter parameters that init_io_u() will use, so we need to
/*
* May alter parameters that init_io_u() will use, so we need to
@@
-945,7
+963,7
@@
static void *thread_main(void *data)
err:
if (td->error)
printf("fio: pid=%d, err=%d/%s\n", td->pid, td->error, td->verror);
err:
if (td->error)
printf("fio: pid=%d, err=%d/%s\n", td->pid, td->error, td->verror);
- close_files(td);
+ close_
and_free_
files(td);
close_ioengine(td);
cleanup_io_u(td);
close_ioengine(td);
cleanup_io_u(td);
@@
-1007,7
+1025,11
@@
static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
else
realthreads++;
else
realthreads++;
- if (!td->pid || td->runstate == TD_REAPED)
+ if (!td->pid) {
+ pending++;
+ continue;
+ }
+ if (td->runstate == TD_REAPED)
continue;
if (td->o.use_thread) {
if (td->runstate == TD_EXITED) {
continue;
if (td->o.use_thread) {
if (td->runstate == TD_EXITED) {
@@
-1059,8
+1081,11
@@
reaped:
if (td->o.use_thread) {
long ret;
if (td->o.use_thread) {
long ret;
- if (pthread_join(td->thread, (void *) &ret))
+ dprint(FD_PROCESS, "joining tread %d\n", td->pid);
+ if (pthread_join(td->thread, (void *) &ret)) {
+ dprint(FD_PROCESS, "join failed %ld\n", ret);
perror("pthread_join");
perror("pthread_join");
+ }
}
(*nr_running)--;
}
(*nr_running)--;
@@
-1175,19
+1200,21
@@
static void run_threads(void)
nr_started++;
if (td->o.use_thread) {
nr_started++;
if (td->o.use_thread) {
+ dprint(FD_PROCESS, "will pthread_create\n");
if (pthread_create(&td->thread, NULL, thread_main, td)) {
perror("thread_create");
nr_started--;
break;
}
} else {
if (pthread_create(&td->thread, NULL, thread_main, td)) {
perror("thread_create");
nr_started--;
break;
}
} else {
+ dprint(FD_PROCESS, "will fork\n");
if (!fork()) {
int ret = fork_main(shm_id, i);
exit(ret);
}
}
if (!fork()) {
int ret = fork_main(shm_id, i);
exit(ret);
}
}
- fio_
sem_down(startup_sem
);
+ fio_
mutex_down(startup_mutex
);
}
/*
}
/*
@@
-1242,7
+1269,7
@@
static void run_threads(void)
m_rate += td->o.ratemin;
t_rate += td->o.rate;
todo--;
m_rate += td->o.ratemin;
t_rate += td->o.rate;
todo--;
- fio_
sem
_up(td->mutex);
+ fio_
mutex
_up(td->mutex);
}
reap_threads(&nr_running, &t_rate, &m_rate);
}
reap_threads(&nr_running, &t_rate, &m_rate);
@@
-1291,7
+1318,7
@@
int main(int argc, char *argv[])
setup_log(&agg_io_log[DDIR_WRITE]);
}
setup_log(&agg_io_log[DDIR_WRITE]);
}
- startup_
sem = fio_sem
_init(0);
+ startup_
mutex = fio_mutex
_init(0);
set_genesis_time();
set_genesis_time();
@@
-1307,6
+1334,6
@@
int main(int argc, char *argv[])
}
}
}
}
- fio_
sem_remove(startup_sem
);
+ fio_
mutex_remove(startup_mutex
);
return exit_value;
}
return exit_value;
}