mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-16 07:52:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 24

picoev: extract common code to a trace_fd/1 function, cleanup

Browse source
This commit is contained in:
Delyan Angelov 2024-10-29 18:32:31 +02:00
parent 3939737a8d
commit 6e9a66dbf3
No known key found for this signature in database
GPG key ID: 66886C0F12D595ED
4 changed files with 22 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

29
vlib/picoev/socket_util.c.v
View file

@ -30,10 +30,7 @@ fn accept(fd int) int {
@[inline]
fn close_socket(fd int) {
$if trace_fd ? {
eprintln('close ${fd}')
}
trace_fd('close ${fd}')
$if windows {
C.closesocket(fd)
} $else {
@ -44,11 +41,9 @@ fn close_socket(fd int) {
@[inline]
fn setup_sock(fd int) ! {
flag := 1
if C.setsockopt(fd, C.IPPROTO_TCP, C.TCP_NODELAY, &flag, sizeof(int)) < 0 {
return error('setup_sock.setup_sock failed')
}
$if freebsd {
if C.fcntl(fd, C.F_SETFL, C.SOCK_NONBLOCK) != 0 {
return error('fcntl failed')
@ -88,11 +83,7 @@ fn fatal_socket_error(fd int) bool {
return false
}
}
$if trace_fd ? {
eprintln('fatal error ${fd}: ${C.errno}')
}
trace_fd('fatal error ${fd}: ${C.errno}')
return true
}
@ -103,22 +94,16 @@ fn listen(config Config) !int {
if fd == -1 {
return error('Failed to create socket')
}
$if trace_fd ? {
eprintln('listen: ${fd}')
}
trace_fd('listen: ${fd}')
// Setting flags for socket
flag := 1
flag_zero := 0
net.socket_error(C.setsockopt(fd, C.SOL_SOCKET, C.SO_REUSEADDR, &flag, sizeof(int)))!
if config.family == .ip6 {
// set socket to dualstack so connections to both ipv4 and ipv6 addresses
// can be accepted
net.socket_error(C.setsockopt(fd, C.IPPROTO_IPV6, C.IPV6_V6ONLY, &flag_zero, sizeof(int)))!
}
$if linux {
// epoll socket options
net.socket_error(C.setsockopt(fd, C.SOL_SOCKET, C.SO_REUSEPORT, &flag, sizeof(int)))!
@ -131,20 +116,18 @@ fn listen(config Config) !int {
sizeof(int)))!
}
}
// addr settings
saddr := '${config.host}:${config.port}'
addrs := net.resolve_addrs(saddr, config.family, .tcp) or { panic(err) }
addrs := net.resolve_addrs(saddr, config.family, .tcp) or {
panic('Error while resolving `${saddr}`, err: ${err}')
}
addr := addrs[0]
alen := addr.len()
net.socket_error_message(C.bind(fd, voidptr(&addr), alen), 'binding to ${saddr} failed')!
net.socket_error_message(C.listen(fd, C.SOMAXCONN), 'listening on ${saddr} with maximum backlog pending queue of ${C.SOMAXCONN}, failed')!
setup_sock(fd) or {
config.err_cb(config.user_data, picohttpparser.Request{}, mut &picohttpparser.Response{},
err)
}
return fd
}