Merge #653

653: Migrate to upstream pflock r=stlankes a=mkroening



Co-authored-by: Martin Kröning <mkroening@posteo.net>

Author: bors[bot]

Cargo.lock

@@ -80,6 +80,7 @@ include-transformed = { version = "0.2", optional = true }
 linked_list_allocator = { version = "0.10", default-features = false }
 log = { version = "0.4", default-features = false }
 pci-ids = { version = "0.2", optional = true }
+pflock = "0.2"
 shell-words = { version = "1.1", default-features = false }
 qemu-exit = "3.0"
 rand_chacha = { version = "0.3", default-features = false }

Cargo.toml

@@ -13,7 +13,6 @@ use crate::env;
 use crate::errno::*;
 use crate::fd::file::{GenericFile, UhyveFile};
 use crate::fd::stdio::*;
-use crate::synch::rwlock::RWLock;
 use crate::syscalls::fs::{self, FilePerms};
 #[cfg(all(feature = "tcp", not(feature = "newlib")))]
 use crate::syscalls::net::*;
@@ -36,8 +35,8 @@ const STDERR_FILENO: FileDescriptor = 2;
 pub(crate) type FileDescriptor = i32;
 
 /// Mapping between file descriptor and the referenced object
-static OBJECT_MAP: RWLock<HashMap<FileDescriptor, Arc<dyn ObjectInterface>, RandomState>> =
-	RWLock::new(HashMap::<
+static OBJECT_MAP: pflock::PFLock<HashMap<FileDescriptor, Arc<dyn ObjectInterface>, RandomState>> =
+	pflock::PFLock::new(HashMap::<
 		FileDescriptor,
 		Arc<dyn ObjectInterface>,
 		RandomState,

src/fd/mod.rs

@@ -2,5 +2,4 @@
 
 pub mod futex;
 pub mod recmutex;
-pub mod rwlock;
 pub mod semaphore;