projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert left-over manual ->runstate setting to td_set_runstate()
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 067aa245a04e9d3dd63d2a020b2f72cd33aad975..a737a310df821b62978fc420a36968d7c64c8324 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-45,6
+45,7
@@
#include "cgroup.h"
#include "profile.h"
#include "lib/rand.h"
#include "cgroup.h"
#include "profile.h"
#include "lib/rand.h"
+#include "memalign.h"
unsigned long page_mask;
unsigned long page_size;
unsigned long page_mask;
unsigned long page_size;
@@
-497,7
+498,6
@@
static void do_verify(struct thread_data *td)
clear_io_u(td, io_u);
} else if (io_u->resid) {
int bytes = io_u->xfer_buflen - io_u->resid;
clear_io_u(td, io_u);
} 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
@@
-515,6
+515,7
@@
static void do_verify(struct thread_data *td)
if (ddir_rw(io_u->ddir))
td->ts.short_io_u[io_u->ddir]++;
if (ddir_rw(io_u->ddir))
td->ts.short_io_u[io_u->ddir]++;
+ f = io_u->file;
if (io_u->offset == f->real_file_size)
goto sync_done;
if (io_u->offset == f->real_file_size)
goto sync_done;
@@
-796,7
+797,7
@@
static void cleanup_io_u(struct thread_data *td)
io_u = flist_entry(entry, struct io_u, list);
flist_del(&io_u->list);
io_u = flist_entry(entry, struct io_u, list);
flist_del(&io_u->list);
- f
ree(io_u
);
+ f
io_memfree(io_u, sizeof(*io_u)
);
}
free_io_mem(td);
}
free_io_mem(td);
@@
-843,8
+844,9
@@
static int init_io_u(struct thread_data *td)
if (td->terminate)
return 1;
if (td->terminate)
return 1;
- if (posix_memalign(&ptr, cl_align, sizeof(*io_u))) {
- log_err("fio: posix_memalign=%s\n", strerror(errno));
+ ptr = fio_memalign(cl_align, sizeof(*io_u));
+ if (!ptr) {
+ log_err("fio: unable to allocate aligned memory\n");
break;
}
break;
}
@@
-1497,14
+1499,14
@@
static void run_threads(void)
todo--;
} else {
struct fio_file *f;
todo--;
} else {
struct fio_file *f;
- unsigned int
i
;
+ unsigned int
j
;
/*
* for sharing to work, each job must always open
* its own files. so close them, if we opened them
* for creation
*/
/*
* for sharing to work, each job must always open
* its own files. so close them, if we opened them
* for creation
*/
- for_each_file(td, f,
i
) {
+ for_each_file(td, f,
j
) {
if (fio_file_open(f))
td_io_close_file(td, f);
}
if (fio_file_open(f))
td_io_close_file(td, f);
}