projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'eta_display' of https://github.com/sitsofe/fio
[fio.git]
/
engines
/
splice.c
diff --git
a/engines/splice.c
b/engines/splice.c
index f35ae17bc574b7af5928e4c73e6e76f8a744b230..d5d8ab0ebafdac9cdc1c6ebd3617109f97adc13a 100644
(file)
--- a/
engines/splice.c
+++ b/
engines/splice.c
@@
-28,11
+28,11
@@
struct spliceio_data {
*/
static int fio_splice_read_old(struct thread_data *td, struct io_u *io_u)
{
*/
static int fio_splice_read_old(struct thread_data *td, struct io_u *io_u)
{
- struct spliceio_data *sd = td->io_ops
->
data;
+ struct spliceio_data *sd = td->io_ops
_
data;
struct fio_file *f = io_u->file;
int ret, ret2, buflen;
off_t offset;
struct fio_file *f = io_u->file;
int ret, ret2, buflen;
off_t offset;
-
void
*p;
+
char
*p;
offset = io_u->offset;
buflen = io_u->xfer_buflen;
offset = io_u->offset;
buflen = io_u->xfer_buflen;
@@
-72,12
+72,13
@@
static int fio_splice_read_old(struct thread_data *td, struct io_u *io_u)
*/
static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
{
*/
static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
{
- struct spliceio_data *sd = td->io_ops
->
data;
+ struct spliceio_data *sd = td->io_ops
_
data;
struct fio_file *f = io_u->file;
struct iovec iov;
int ret , buflen, mmap_len;
off_t offset;
struct fio_file *f = io_u->file;
struct iovec iov;
int ret , buflen, mmap_len;
off_t offset;
- void *p, *map;
+ void *map;
+ char *p;
ret = 0;
offset = io_u->offset;
ret = 0;
offset = io_u->offset;
@@
-166,7
+167,7
@@
static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
*/
static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
{
*/
static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
{
- struct spliceio_data *sd = td->io_ops
->
data;
+ struct spliceio_data *sd = td->io_ops
_
data;
struct iovec iov = {
.iov_base = io_u->xfer_buf,
.iov_len = io_u->xfer_buflen,
struct iovec iov = {
.iov_base = io_u->xfer_buf,
.iov_len = io_u->xfer_buflen,
@@
-201,7
+202,7
@@
static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
{
static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
{
- struct spliceio_data *sd = td->io_ops
->
data;
+ struct spliceio_data *sd = td->io_ops
_
data;
int ret = 0;
fio_ro_check(td, io_u);
int ret = 0;
fio_ro_check(td, io_u);
@@
-247,7
+248,7
@@
static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
static void fio_spliceio_cleanup(struct thread_data *td)
{
static void fio_spliceio_cleanup(struct thread_data *td)
{
- struct spliceio_data *sd = td->io_ops
->
data;
+ struct spliceio_data *sd = td->io_ops
_
data;
if (sd) {
close(sd->pipe[0]);
if (sd) {
close(sd->pipe[0]);
@@
-284,7
+285,7
@@
static int fio_spliceio_init(struct thread_data *td)
if (td_read(td))
td->o.mem_align = 1;
if (td_read(td))
td->o.mem_align = 1;
- td->io_ops
->
data = sd;
+ td->io_ops
_
data = sd;
return 0;
}
return 0;
}