Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update liburing's submodule in anticipation of the release #27

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update liburing's submodule in anticipation of the release #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9bc89d
use int64_t types instead of loff_t
Feb 12, 2021
b61f3c9
pad structures to match liburing
Feb 12, 2021
5994eb1
implement the free_probe function, newly added to liburing
Sep 9, 2020
acc3454
pad the io_uring structure to match liburing's
Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion liburing
Open in desktop
Submodule liburing updated from 45f073 to 10a9ff
4 changes: 2 additions & 2 deletions rusturing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ extern inline void rust_io_uring_prep_rw(int op,
}

extern inline void rust_io_uring_prep_splice(struct io_uring_sqe *sqe,
int fd_in, loff_t off_in,
int fd_out, loff_t off_out,
int fd_in, int64_t off_in,
int fd_out, int64_t off_out,
unsigned int nbytes,
unsigned int splice_flags)
{
Expand Down
9 changes: 9 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ pub struct io_uring {
pub cq: io_uring_cq,
pub flags: libc::c_uint,
pub ring_fd: libc::c_int,

pub features: libc::c_uint,
pub pad: [libc::c_uint; 3],
}

#[derive(Debug)]
Expand All @@ -136,6 +139,8 @@ pub struct io_uring_sq {

pub ring_sz: libc::size_t,
pub ring_ptr: *mut libc::c_void,

pub pad: [libc::c_uint; 4],
}

#[derive(Debug)]
Expand All @@ -151,6 +156,8 @@ pub struct io_uring_cq {

pub ring_sz: libc::size_t,
pub ring_ptr: *mut libc::c_void,

pub pad: [libc::c_uint; 4],
}

#[repr(C)]
Expand Down Expand Up @@ -298,6 +305,8 @@ extern {

pub fn io_uring_get_probe() -> *mut io_uring_probe;

pub fn io_uring_free_probe(probe: *mut io_uring_probe);

pub fn io_uring_dontfork(ring: *mut io_uring) -> libc::c_int;

pub fn io_uring_queue_exit(ring: *mut io_uring);
Expand Down