Skip to content

Add socket sendfile function #2311

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

Merged
coolreader18 merged 8 commits into from
Oct 28, 2020
Merged

Add socket sendfile function #2311

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
00920ba
Add socket sendfile function
rodrigocam Oct 26, 2020
a656c51
Add os sendfile function and python test
rodrigocam Oct 27, 2020
01e6f73
Remove socket sendfile wrong implementation
rodrigocam Oct 27, 2020
a8d579d
Add guard clause to check if os has sendfile function
rodrigocam Oct 27, 2020
a64ecbf
Process headers and trailers as array of byte buffers
rodrigocam Oct 27, 2020
6de2dc6
Add macro call to allow function up to seven parameters
rodrigocam Oct 28, 2020
7d45672
Skip unrelated test in test_os
coolreader18 Oct 28, 2020
ad3922a
Skip shutil test
coolreader18 Oct 28, 2020
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
Prev Previous commit
Next Next commit
Process headers and trailers as array of byte buffers
  • Loading branch information
@rodrigocam
rodrigocam committed Oct 27, 2020
commit a64ecbf00a0a9f04edaed6b6fc00cad85025dd42
43 changes: 31 additions & 12 deletions vm/src/stdlib/os.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,22 +360,41 @@ mod _os {
out_fd: i32,
in_fd: i32,
offset: i64,
count: u64,
count: i64,
headers: OptionalArg<PyObjectRef>,
trailers: OptionalArg<PyObjectRef>,
flags: OptionalArg<i64>,
flags: OptionalArg<i32>,
Copy link
Copy Markdown
Member

@youknowone youknowone Oct 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding _ prefix like _flags will remove this warning

vm: &VirtualMachine,
) -> PyResult {
let mut _count = count;
let (res, written) = nix::sys::sendfile::sendfile(
in_fd,
out_fd,
offset,
Some(&mut _count),
headers.into_option(),
trailers.into_option(),
)
.map_err(|err| err.into_pyexception(vm))?;
let headers = match headers.into_option() {
Some(x) => Some(vm.extract_elements::<PyBytesLike>(&x)?),
None => None,
};

let headers = headers
.as_ref()
.map(|v| v.iter().map(|b| b.borrow_value()).collect::<Vec<_>>());
let headers = headers
.as_ref()
.map(|v| v.iter().map(|borrowed| &**borrowed).collect::<Vec<_>>());
let headers = headers.as_deref();

let trailers = match trailers.into_option() {
Some(x) => Some(vm.extract_elements::<PyBytesLike>(&x)?),
None => None,
};

let trailers = trailers
.as_ref()
.map(|v| v.iter().map(|b| b.borrow_value()).collect::<Vec<_>>());
let trailers = trailers
.as_ref()
.map(|v| v.iter().map(|borrowed| &**borrowed).collect::<Vec<_>>());
let trailers = trailers.as_deref();

let (res, written) =
nix::sys::sendfile::sendfile(in_fd, out_fd, offset, Some(count), headers, trailers);
res.map_err(|err| err.into_pyexception(vm))?;
Ok(vm.ctx.new_int(written as u64))
}

Expand Down