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

Jump to bottom

fix wait_imp on windows #13

Merged
merged 1 commit into from Dec 26, 2022
Merged

fix wait_imp on windows #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/stdlib/child/windows.rs
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ use winapi::{
},
um::{
handleapi::CloseHandle, ioapiset::GetQueuedCompletionStatus, jobapi2::TerminateJobObject,
minwinbase::LPOVERLAPPED, winbase::INFINITE, winnt::HANDLE,
minwinbase::OVERLAPPED, winbase::INFINITE, winnt::HANDLE,
},
};

Expand Down Expand Up @@ -70,21 +70,22 @@ impl ChildImp {
fn wait_imp(&self, timeout: DWORD) -> Result<()> {
let mut code: DWORD = 0;
let mut key: ULONG_PTR = 0;
let mut overlapped = mem::MaybeUninit::<LPOVERLAPPED>::uninit();
let mut overlapped = mem::MaybeUninit::<OVERLAPPED>::uninit();
let mut lp_overlapped = overlapped.as_mut_ptr();

let result = unsafe {
GetQueuedCompletionStatus(
self.handles.completion_port,
&mut code,
&mut key,
overlapped.as_mut_ptr(),
&mut lp_overlapped,
timeout,
)
};

// ignore timing out errors unless the timeout was specified to INFINITE
// https://docs.microsoft.com/en-us/windows/win32/api/ioapiset/nf-ioapiset-getqueuedcompletionstatus
if timeout != INFINITE && result == FALSE && overlapped.as_ptr().is_null() {
if timeout != INFINITE && result == FALSE && lp_overlapped.is_null() {
return Ok(());
}

Expand Down
9 changes: 5 additions & 4 deletions src/tokio/child/windows.rs
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ use winapi::{
},
um::{
handleapi::CloseHandle, ioapiset::GetQueuedCompletionStatus, jobapi2::TerminateJobObject,
minwinbase::LPOVERLAPPED, winbase::INFINITE, winnt::HANDLE,
minwinbase::OVERLAPPED, winbase::INFINITE, winnt::HANDLE,
},
};

Expand Down Expand Up @@ -70,21 +70,22 @@ impl ChildImp {
fn wait_imp(handles: JobPort, timeout: DWORD) -> Result<()> {
let mut code: DWORD = 0;
let mut key: ULONG_PTR = 0;
let mut overlapped = mem::MaybeUninit::<LPOVERLAPPED>::uninit();
let mut overlapped = mem::MaybeUninit::<OVERLAPPED>::uninit();
let mut lp_overlapped = overlapped.as_mut_ptr();

let result = unsafe {
GetQueuedCompletionStatus(
handles.completion_port,
&mut code,
&mut key,
overlapped.as_mut_ptr(),
&mut lp_overlapped,
timeout,
)
};

// ignore timing out errors unless the timeout was specified to INFINITE
// https://docs.microsoft.com/en-us/windows/win32/api/ioapiset/nf-ioapiset-getqueuedcompletionstatus
if timeout != INFINITE && result == FALSE && overlapped.as_ptr().is_null() {
if timeout != INFINITE && result == FALSE && lp_overlapped.is_null() {
return Ok(());
}

Expand Down