Skip to content

Socket.fileno #850

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
merged 4 commits into from
Apr 20, 2019
Merged

Socket.fileno #850

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
cf0a920
Add socket.fileno for unix
palaviv Apr 19, 2019
e7b059e
Add socket.fileno for windows
palaviv Apr 19, 2019
2bc72da
Move fileno logic to Connection impl
palaviv Apr 19, 2019
f42c2a6
Test fileno only on posix
palaviv Apr 19, 2019
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
13 changes: 13 additions & 0 deletions tests/snippets/stdlib_socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import socket
import os
from testutils import assertRaises

MESSAGE_A = b'aaaa'
Expand All @@ -21,6 +22,18 @@
recv_b = connector.recv(len(MESSAGE_B))
assert recv_a == MESSAGE_A
assert recv_b == MESSAGE_B

# fileno
if os.name == "posix":
connector_fd = connector.fileno()
connection_fd = connection.fileno()
os.write(connector_fd, MESSAGE_A)
connection.send(MESSAGE_B)
recv_a = connection.recv(len(MESSAGE_A))
recv_b = os.read(connector_fd, (len(MESSAGE_B)))
assert recv_a == MESSAGE_A
assert recv_b == MESSAGE_B

connection.close()
connector.close()
listener.close()
Expand Down
40 changes: 40 additions & 0 deletions vm/src/stdlib/socket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,33 @@ impl Connection {
_ => Err(io::Error::new(io::ErrorKind::Other, "oh no!")),
}
}

#[cfg(unix)]
fn fileno(&self) -> i64 {
use std::os::unix::io::AsRawFd;
let raw_fd = match self {
Connection::TcpListener(con) => con.as_raw_fd(),
Connection::UdpSocket(con) => con.as_raw_fd(),
Connection::TcpStream(con) => con.as_raw_fd(),
};
raw_fd as i64
}

#[cfg(windows)]
fn fileno(&self) -> i64 {
use std::os::windows::io::AsRawSocket;
let raw_fd = match self {
Connection::TcpListener(con) => con.as_raw_socket(),
Connection::UdpSocket(con) => con.as_raw_socket(),
Connection::TcpStream(con) => con.as_raw_socket(),
};
raw_fd as i64
}

#[cfg(all(not(unix), not(windows)))]
fn fileno(&self) -> i64 {
unimplemented!();
}
}

impl Read for Connection {
Expand Down Expand Up @@ -387,6 +414,18 @@ fn socket_close(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
Ok(vm.get_none())
}

fn socket_fileno(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
arg_check!(vm, args, required = [(zelf, None)]);

let socket = get_socket(zelf);

let fileno = match socket.con.borrow_mut().as_mut() {
Some(v) => v.fileno(),
None => return Err(vm.new_type_error("".to_string())),
};
Ok(vm.ctx.new_int(fileno))
}

fn socket_getsockname(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
arg_check!(vm, args, required = [(zelf, None)]);
let socket = get_socket(zelf);
Expand Down Expand Up @@ -424,6 +463,7 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
"getsockname" => ctx.new_rustfunc(socket_getsockname),
"sendto" => ctx.new_rustfunc(socket_sendto),
"recvfrom" => ctx.new_rustfunc(socket_recvfrom),
"fileno" => ctx.new_rustfunc(socket_fileno),
});

py_module!(vm, "socket", {
Expand Down