diff options
| author | Mohsen Zohrevandi <mohsen.zohrevandi@fortanix.com> | 2020-07-15 15:48:36 -0700 |
|---|---|---|
| committer | Mohsen Zohrevandi <mohsen.zohrevandi@fortanix.com> | 2020-07-15 15:48:36 -0700 |
| commit | 85c25aed510ce599504b172f7c7bef280e91637b (patch) | |
| tree | a80a4b1cd516f4516cb7ab85027db12ca8c4b6ac /src/libstd/sys/sgx/waitqueue.rs | |
| parent | 1466598e19321bc6b97aef8271a317e78211d54d (diff) | |
| download | rust-85c25aed510ce599504b172f7c7bef280e91637b.tar.gz rust-85c25aed510ce599504b172f7c7bef280e91637b.zip | |
Move usercall_wait_timeout to abi::usercalls::wait_timeout
Diffstat (limited to 'src/libstd/sys/sgx/waitqueue.rs')
| -rw-r--r-- | src/libstd/sys/sgx/waitqueue.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/sys/sgx/waitqueue.rs b/src/libstd/sys/sgx/waitqueue.rs index c8ccab2247a..070afa55f30 100644 --- a/src/libstd/sys/sgx/waitqueue.rs +++ b/src/libstd/sys/sgx/waitqueue.rs @@ -11,7 +11,6 @@ //! The queue and associated wait state are stored in a `WaitVariable`. use crate::num::NonZeroUsize; use crate::ops::{Deref, DerefMut}; -use crate::sys::usercall_wait_timeout; use crate::time::Duration; use super::abi::thread; @@ -176,7 +175,7 @@ impl WaitQueue { })); let entry_lock = lock.lock().queue.inner.push(&mut entry); before_wait(); - usercall_wait_timeout(EV_UNPARK, timeout, || entry_lock.lock().wake); + usercalls::wait_timeout(EV_UNPARK, timeout, || entry_lock.lock().wake); // acquire the wait queue's lock first to avoid deadlock. let mut guard = lock.lock(); let success = entry_lock.lock().wake; |
