Rename RWLock to RwLock in std::sys.
This commit is contained in:
@@ -10,7 +10,7 @@ cfg_if::cfg_if! {
|
||||
mod pthread_rwlock; // FIXME: Implement this using a futex
|
||||
pub use futex::{Mutex, MovableMutex, Condvar, MovableCondvar};
|
||||
pub use pthread_remutex::ReentrantMutex;
|
||||
pub use pthread_rwlock::{RWLock, MovableRWLock};
|
||||
pub use pthread_rwlock::{RwLock, MovableRwLock};
|
||||
} else {
|
||||
mod pthread_mutex;
|
||||
mod pthread_remutex;
|
||||
@@ -18,7 +18,7 @@ cfg_if::cfg_if! {
|
||||
mod pthread_condvar;
|
||||
pub use pthread_mutex::{Mutex, MovableMutex};
|
||||
pub use pthread_remutex::ReentrantMutex;
|
||||
pub use pthread_rwlock::{RWLock, MovableRWLock};
|
||||
pub use pthread_rwlock::{RwLock, MovableRwLock};
|
||||
pub use pthread_condvar::{Condvar, MovableCondvar};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
use crate::cell::UnsafeCell;
|
||||
use crate::sync::atomic::{AtomicUsize, Ordering};
|
||||
|
||||
pub struct RWLock {
|
||||
pub struct RwLock {
|
||||
inner: UnsafeCell<libc::pthread_rwlock_t>,
|
||||
write_locked: UnsafeCell<bool>, // guarded by the `inner` RwLock
|
||||
num_readers: AtomicUsize,
|
||||
}
|
||||
|
||||
pub type MovableRWLock = Box<RWLock>;
|
||||
pub type MovableRwLock = Box<RwLock>;
|
||||
|
||||
unsafe impl Send for RWLock {}
|
||||
unsafe impl Sync for RWLock {}
|
||||
unsafe impl Send for RwLock {}
|
||||
unsafe impl Sync for RwLock {}
|
||||
|
||||
impl RWLock {
|
||||
pub const fn new() -> RWLock {
|
||||
RWLock {
|
||||
impl RwLock {
|
||||
pub const fn new() -> RwLock {
|
||||
RwLock {
|
||||
inner: UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER),
|
||||
write_locked: UnsafeCell::new(false),
|
||||
num_readers: AtomicUsize::new(0),
|
||||
|
||||
Reference in New Issue
Block a user