projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libpmem: update print statement for bs now being ULL
[fio.git]
/
backend.c
diff --git
a/backend.c
b/backend.c
index 151210a439ba303a18c995d11fa08baac1c3bec7..3c45e7898728669c4abe211d5be4004532dbe802 100644
(file)
--- a/
backend.c
+++ b/
backend.c
@@
-50,7
+50,7
@@
static struct fio_sem *startup_sem;
static struct flist_head *cgroup_list;
static struct fio_sem *startup_sem;
static struct flist_head *cgroup_list;
-static
char
*cgroup_mnt;
+static
struct cgroup_mnt
*cgroup_mnt;
static int exit_value;
static volatile int fio_abort;
static unsigned int nr_process = 0;
static int exit_value;
static volatile int fio_abort;
static unsigned int nr_process = 0;
@@
-454,7
+454,7
@@
int io_queue_event(struct thread_data *td, struct io_u *io_u, int *ret,
*ret = -io_u->error;
clear_io_u(td, io_u);
} else if (io_u->resid) {
*ret = -io_u->error;
clear_io_u(td, io_u);
} else if (io_u->resid) {
-
int
bytes = io_u->xfer_buflen - io_u->resid;
+
long long
bytes = io_u->xfer_buflen - io_u->resid;
struct fio_file *f = io_u->file;
if (bytes_issued)
struct fio_file *f = io_u->file;
if (bytes_issued)
@@
-583,7
+583,7
@@
static bool in_flight_overlap(struct io_u_queue *q, struct io_u *io_u)
if (x1 < y2 && y1 < x2) {
overlap = true;
if (x1 < y2 && y1 < x2) {
overlap = true;
- dprint(FD_IO, "in-flight overlap: %llu/%l
u, %llu/%
lu\n",
+ dprint(FD_IO, "in-flight overlap: %llu/%l
lu, %llu/%l
lu\n",
x1, io_u->buflen,
y1, check_io_u->buflen);
break;
x1, io_u->buflen,
y1, check_io_u->buflen);
break;
@@
-1033,8
+1033,8
@@
static void do_io(struct thread_data *td, uint64_t *bytes_done)
log_io_piece(td, io_u);
if (td->o.io_submit_mode == IO_MODE_OFFLOAD) {
log_io_piece(td, io_u);
if (td->o.io_submit_mode == IO_MODE_OFFLOAD) {
- const unsigned long blen = io_u->xfer_buflen;
- const enum fio_ddir ddir = acct_ddir(io_u);
+ const unsigned long
long
blen = io_u->xfer_buflen;
+ const enum fio_ddir
__
ddir = acct_ddir(io_u);
if (td->error)
break;
if (td->error)
break;
@@
-1042,14
+1042,14
@@
static void do_io(struct thread_data *td, uint64_t *bytes_done)
workqueue_enqueue(&td->io_wq, &io_u->work);
ret = FIO_Q_QUEUED;
workqueue_enqueue(&td->io_wq, &io_u->work);
ret = FIO_Q_QUEUED;
- if (ddir_rw(ddir)) {
- td->io_issues[ddir]++;
- td->io_issue_bytes[ddir] += blen;
- td->rate_io_issue_bytes[ddir] += blen;
+ if (ddir_rw(
__
ddir)) {
+ td->io_issues[
__
ddir]++;
+ td->io_issue_bytes[
__
ddir] += blen;
+ td->rate_io_issue_bytes[
__
ddir] += blen;
}
if (should_check_rate(td))
}
if (should_check_rate(td))
- td->rate_next_io_time[
ddir] = usec_for_io(td,
ddir);
+ td->rate_next_io_time[
__ddir] = usec_for_io(td, __
ddir);
} else {
ret = io_u_submit(td, io_u);
} else {
ret = io_u_submit(td, io_u);
@@
-1199,7
+1199,7
@@
static void cleanup_io_u(struct thread_data *td)
static int init_io_u(struct thread_data *td)
{
struct io_u *io_u;
static int init_io_u(struct thread_data *td)
{
struct io_u *io_u;
- unsigned
int
max_bs, min_write;
+ unsigned
long long
max_bs, min_write;
int cl_align, i, max_units;
int data_xfer = 1, err;
char *p;
int cl_align, i, max_units;
int data_xfer = 1, err;
char *p;
@@
-1234,7
+1234,7
@@
static int init_io_u(struct thread_data *td)
td->orig_buffer_size += page_mask + td->o.mem_align;
if (td->o.mem_type == MEM_SHMHUGE || td->o.mem_type == MEM_MMAPHUGE) {
td->orig_buffer_size += page_mask + td->o.mem_align;
if (td->o.mem_type == MEM_SHMHUGE || td->o.mem_type == MEM_MMAPHUGE) {
- unsigned long bs;
+ unsigned long
long
bs;
bs = td->orig_buffer_size + td->o.hugepage_size - 1;
td->orig_buffer_size = bs & ~(td->o.hugepage_size - 1);
bs = td->orig_buffer_size + td->o.hugepage_size - 1;
td->orig_buffer_size = bs & ~(td->o.hugepage_size - 1);
@@
-1886,7
+1886,7
@@
err:
close_and_free_files(td);
cleanup_io_u(td);
close_ioengine(td);
close_and_free_files(td);
cleanup_io_u(td);
close_ioengine(td);
- cgroup_shutdown(td,
&
cgroup_mnt);
+ cgroup_shutdown(td, cgroup_mnt);
verify_free_state(td);
if (td->zone_state_index) {
verify_free_state(td);
if (td->zone_state_index) {
@@
-2508,7
+2508,6
@@
int fio_backend(struct sk_out *sk_out)
cgroup_kill(cgroup_list);
sfree(cgroup_list);
}
cgroup_kill(cgroup_list);
sfree(cgroup_list);
}
- sfree(cgroup_mnt);
fio_sem_remove(startup_sem);
stat_exit();
fio_sem_remove(startup_sem);
stat_exit();