Skip to content

Commit 579e84c

Browse files
authored
update dependencies (#410)
2 parents 50ad55f + c08a44d commit 579e84c

File tree

9 files changed

+16
-14
lines changed

9 files changed

+16
-14
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ open-coroutine-macros = { path = "macros", version = "0.7.0" }
2727
tracing = { version = "0.1", default-features = false }
2828
tracing-subscriber = { version = "0.3", default-features = false }
2929
tracing-appender = { version = "0.2", default-features = false }
30-
cargo_metadata = { version = "0.19", default-features = false }
30+
cargo_metadata = { version = "0.20", default-features = false }
3131
mio = { version = "1.0", default-features = false }
3232

3333
cfg-if = "1.0.0"
@@ -45,7 +45,7 @@ crossbeam-utils = "0.8"
4545
crossbeam-skiplist = "0.1"
4646
nix = "0.30"
4747
io-uring = "0.7"
48-
windows-sys = "0.59"
48+
windows-sys = "0.60"
4949
anyhow = "1.0"
5050
slab = "0.4"
5151
backtrace = "0.3"

core/docs/en/work-steal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ better to let them help other threads work.
2323
## What is work steal queue?
2424

2525
A work steal queue consists of a global queue and multiple local queues, the global queue is unbounded, while the local
26-
queue has a bounded RingBuffer. To ensure high performance, the number of local queues is usually equal to the number of
26+
queue has a bounded `RingBuffer`. To ensure high performance, the number of local queues is usually equal to the number of
2727
threads. I's worth mentioning that if all threads prioritize local tasks, there will be an extreme situation where tasks
2828
on the shared queue will never have a chance to be scheduled. To avoid this imbalance, refer to goroutine, every time a
2929
thread has scheduled 60 tasks from the local queue, it will be forced to pop a task from the shared queue.

core/src/net/operator/linux/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl Operator<'_> {
9393
&self,
9494
timeout: Option<Duration>,
9595
want: usize,
96-
) -> std::io::Result<(usize, CompletionQueue, Option<Duration>)> {
96+
) -> std::io::Result<(usize, CompletionQueue<'_>, Option<Duration>)> {
9797
if support_io_uring() {
9898
if self
9999
.entering
@@ -113,7 +113,7 @@ impl Operator<'_> {
113113
&self,
114114
timeout: Option<Duration>,
115115
want: usize,
116-
) -> std::io::Result<(usize, CompletionQueue, Option<Duration>)> {
116+
) -> std::io::Result<(usize, CompletionQueue<'_>, Option<Duration>)> {
117117
let start_time = Instant::now();
118118
self.timeout_add(crate::common::constants::IO_URING_TIMEOUT_USERDATA, timeout)?;
119119
let mut cq = unsafe { self.inner.completion_shared() };

core/src/net/operator/windows/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ impl<'o> Operator<'o> {
142142
self.iocp,
143143
uninit.as_mut_ptr().cast(),
144144
uninit.len().try_into().expect("overflow"),
145-
&mut recv_count,
145+
&raw mut recv_count,
146146
left_ns
147147
.saturating_div(1_000_000)
148148
.try_into()
@@ -242,7 +242,7 @@ impl<'o> Operator<'o> {
242242
SOL_SOCKET,
243243
SO_PROTOCOL_INFO,
244244
std::ptr::from_mut(&mut sock_info).cast(),
245-
&mut sock_info_len,
245+
&raw mut sock_info_len,
246246
) != 0
247247
{
248248
return Err(Error::other("get socket info failed"));
@@ -252,7 +252,7 @@ impl<'o> Operator<'o> {
252252
sock_info.iAddressFamily,
253253
sock_info.iSocketType,
254254
sock_info.iProtocol,
255-
&sock_info,
255+
&raw const sock_info,
256256
0,
257257
WSA_FLAG_OVERLAPPED,
258258
);

core/src/syscall/windows/SetFilePointerEx.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::ffi::c_longlong;
2-
use windows_sys::Win32::Foundation::{BOOL, HANDLE};
2+
use windows_sys::core::BOOL;
3+
use windows_sys::Win32::Foundation::HANDLE;
34
use windows_sys::Win32::Storage::FileSystem::SET_FILE_POINTER_MOVE_METHOD;
45

56
trait SetFilePointerExSyscall {

core/src/syscall/windows/WaitOnAddress.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use std::ffi::{c_uint, c_void};
22
use std::time::Duration;
3-
use windows_sys::Win32::Foundation::{BOOL, ERROR_TIMEOUT, FALSE, TRUE};
3+
use windows_sys::core::BOOL;
4+
use windows_sys::Win32::Foundation::{ERROR_TIMEOUT, FALSE, TRUE};
45
use crate::common::{get_timeout_time, now};
56
use crate::net::EventLoops;
67
use crate::syscall::reset_errno;

core/src/syscall/windows/accept.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ impl<I: AcceptSyscall> AcceptSyscall for IocpAcceptSyscall<I> {
9090
SOL_SOCKET,
9191
SO_PROTOCOL_INFO,
9292
std::ptr::from_mut(&mut sock_info).cast(),
93-
&mut sock_info_len,
93+
&raw mut sock_info_len,
9494
) != 0
9595
{
9696
return INVALID_SOCKET;

hook/src/syscall/windows.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::ffi::{c_int, c_longlong, c_uint, c_void};
22
use std::io::Error;
3-
use windows_sys::core::{PCSTR, PCWSTR, PSTR};
4-
use windows_sys::Win32::Foundation::{BOOL, HANDLE, TRUE};
3+
use windows_sys::core::{BOOL, PCSTR, PCWSTR, PSTR};
4+
use windows_sys::Win32::Foundation::{HANDLE, TRUE};
55
use windows_sys::Win32::Networking::WinSock::{
66
FD_SET, IPPROTO, LPCONDITIONPROC, LPWSAOVERLAPPED_COMPLETION_ROUTINE, SEND_RECV_FLAGS,
77
SOCKADDR, SOCKET, TIMEVAL, WINSOCK_SHUTDOWN_HOW, WINSOCK_SOCKET_TYPE, WSABUF, WSAPOLLFD,

open-coroutine/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fn main() {
5151
metadata
5252
.packages
5353
.iter()
54-
.find(|pkg| pkg.name.eq("open-coroutine"))
54+
.find(|pkg| pkg.name.as_str().eq("open-coroutine"))
5555
.expect("read current package failed")
5656
} else {
5757
metadata

0 commit comments

Comments
 (0)