Skip to content

delete #![allow(unsafe_op_in_unsafe_fn)] in teeos #127789

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 5 commits into from
Jul 16, 2024
Merged

delete #![allow(unsafe_op_in_unsafe_fn)] in teeos #127789

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0081162
delete #![allow(unsafe_op_in_unsafe_fn)]
Sword-Destiny Jul 16, 2024
060a40d
clean unsafe op in unsafe fn
Sword-Destiny Jul 16, 2024
00fff8a
clean unsafe op in unsafe fn
Sword-Destiny Jul 16, 2024
af5c90d
clean unsafe op in unsafe fn
Sword-Destiny Jul 16, 2024
9183af2
deny unsafe_op_in_unsafe_fn for teeos
Sword-Destiny Jul 16, 2024
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
clean unsafe op in unsafe fn
  • Loading branch information
@Sword-Destiny
Sword-Destiny authored Jul 16, 2024
commit 00fff8ac648d486b777c4345ba589be1f5643c59
8 changes: 4 additions & 4 deletions library/std/src/sys/sync/condvar/teeos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,24 +76,24 @@ impl Condvar {

#[inline]
pub unsafe fn wait(&self, mutex: &Mutex) {
let mutex = mutex::raw(mutex);
let mutex = unsafe { mutex::raw(mutex) };
self.verify(mutex);
let r = libc::pthread_cond_wait(raw(self), mutex);
let r = unsafe { libc::pthread_cond_wait(raw(self), mutex) };
debug_assert_eq!(r, 0);
}

pub unsafe fn wait_timeout(&self, mutex: &Mutex, dur: Duration) -> bool {
use crate::sys::time::Timespec;

let mutex = mutex::raw(mutex);
let mutex = unsafe { mutex::raw(mutex) };
self.verify(mutex);

let timeout = Timespec::now(libc::CLOCK_MONOTONIC)
.checked_add_duration(&dur)
.and_then(|t| t.to_timespec())
.unwrap_or(TIMESPEC_MAX);

let r = pthread_cond_timedwait(raw(self), mutex, &timeout);
let r = unsafe { pthread_cond_timedwait(raw(self), mutex, &timeout) };
assert!(r == libc::ETIMEDOUT || r == 0);
r == 0
}
Expand Down