projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix problem with f->last_completed_pos not being correct on requeues
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index bed1e28770d1b2cb2a79edf0dccfd9bc796a28e4..296ac343fb437bd14bca2ca1691ae8b66c8670b4 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-35,7
+35,6
@@
#include <sys/mman.h>
#include "fio.h"
#include <sys/mman.h>
#include "fio.h"
-#include "os.h"
unsigned long page_mask;
unsigned long page_size;
unsigned long page_mask;
unsigned long page_size;
@@
-333,6
+332,7
@@
static void do_verify(struct thread_data *td)
ret = -io_u->error;
else if (io_u->resid) {
int bytes = io_u->xfer_buflen - io_u->resid;
ret = -io_u->error;
else if (io_u->resid) {
int bytes = io_u->xfer_buflen - io_u->resid;
+ struct fio_file *f = io_u->file;
/*
* zero read, fail
/*
* zero read, fail
@@
-342,10
+342,18
@@
static void do_verify(struct thread_data *td)
put_io_u(td, io_u);
break;
}
put_io_u(td, io_u);
break;
}
+
io_u->xfer_buflen = io_u->resid;
io_u->xfer_buf += bytes;
io_u->xfer_buflen = io_u->resid;
io_u->xfer_buf += bytes;
+ io_u->offset += bytes;
+ f->last_completed_pos = io_u->offset;
+
+ if (io_u->offset == f->real_file_size)
+ goto sync_done;
+
requeue_io_u(td, &io_u);
} else {
requeue_io_u(td, &io_u);
} else {
+sync_done:
ret = io_u_sync_complete(td, io_u);
if (ret < 0)
break;
ret = io_u_sync_complete(td, io_u);
if (ret < 0)
break;
@@
-412,7
+420,7
@@
static void do_io(struct thread_data *td)
td_set_runstate(td, TD_RUNNING);
td_set_runstate(td, TD_RUNNING);
- while ((td->this_io_bytes[0] + td->this_io_bytes[1]) < td->
io_
size) {
+ while ((td->this_io_bytes[0] + td->this_io_bytes[1]) < td->
o.
size) {
struct timeval comp_time;
long bytes_done = 0;
int min_evts = 0;
struct timeval comp_time;
long bytes_done = 0;
int min_evts = 0;
@@
-440,6
+448,7
@@
static void do_io(struct thread_data *td)
ret = -io_u->error;
else if (io_u->resid) {
int bytes = io_u->xfer_buflen - io_u->resid;
ret = -io_u->error;
else if (io_u->resid) {
int bytes = io_u->xfer_buflen - io_u->resid;
+ struct fio_file *f = io_u->file;
/*
* zero read, fail
/*
* zero read, fail
@@
-452,8
+461,15
@@
static void do_io(struct thread_data *td)
io_u->xfer_buflen = io_u->resid;
io_u->xfer_buf += bytes;
io_u->xfer_buflen = io_u->resid;
io_u->xfer_buf += bytes;
+ io_u->offset += bytes;
+ f->last_completed_pos = io_u->offset;
+
+ if (io_u->offset == f->real_file_size)
+ goto sync_done;
+
requeue_io_u(td, &io_u);
} else {
requeue_io_u(td, &io_u);
} else {
+sync_done:
fio_gettime(&comp_time, NULL);
bytes_done = io_u_sync_complete(td, io_u);
if (bytes_done < 0)
fio_gettime(&comp_time, NULL);
bytes_done = io_u_sync_complete(td, io_u);
if (bytes_done < 0)
@@
-650,7
+666,11
@@
static int switch_ioscheduler(struct thread_data *td)
f = fopen(tmp, "r+");
if (!f) {
f = fopen(tmp, "r+");
if (!f) {
- td_verror(td, errno, "fopen");
+ if (errno == ENOENT) {
+ log_err("fio: os or kernel doesn't support IO scheduler switching\n");
+ return 0;
+ }
+ td_verror(td, errno, "fopen iosched");
return 1;
}
return 1;
}
@@
-978,6
+998,7
@@
static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
/*
* thread is not dead, continue
*/
/*
* thread is not dead, continue
*/
+ pending++;
continue;
reaped:
if (td->o.use_thread) {
continue;
reaped:
if (td->o.use_thread) {
@@
-990,6
+1011,7
@@
reaped:
(*nr_running)--;
(*m_rate) -= td->o.ratemin;
(*t_rate) -= td->o.rate;
(*nr_running)--;
(*m_rate) -= td->o.ratemin;
(*t_rate) -= td->o.rate;
+ pending--;
if (td->error)
exit_value++;
if (td->error)
exit_value++;
@@
-1197,10
+1219,8
@@
int main(int argc, char *argv[])
if (parse_options(argc, argv))
return 1;
if (parse_options(argc, argv))
return 1;
- if (!thread_number) {
- log_err("Nothing to do\n");
- return 1;
- }
+ if (!thread_number)
+ return 0;
ps = sysconf(_SC_PAGESIZE);
if (ps < 0) {
ps = sysconf(_SC_PAGESIZE);
if (ps < 0) {