YGGverse/agate
1
0
Fork 0
mirror of https://github.com/YGGverse/agate.git synced 2026-04-08 20:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use Mutex instead of RwLock

Browse source 
Since we only ever need to access it mutably, no need to differentiate
mutable and immutable acces.
This commit is contained in:
Johann150 2021-02-04 17:56:50 +01:00
parent ac7af67cc5
commit f1ff0fe0fe
No known key found for this signature in database
GPG key ID: 9EE6577A2A06F8F1
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -16,7 +16,7 @@ use {
io::{AsyncReadExt, AsyncWriteExt}, io::{AsyncReadExt, AsyncWriteExt},
net::{TcpListener, TcpStream}, net::{TcpListener, TcpStream},
runtime::Runtime, runtime::Runtime,
sync::RwLock, sync::Mutex,
}, },
tokio_rustls::{server::TlsStream, TlsAcceptor}, tokio_rustls::{server::TlsStream, TlsAcceptor},
url::{Host, Url}, url::{Host, Url},
@ -27,7 +27,7 @@ fn main() -> Result {
env_logger::Builder::new().parse_filters("info").init(); env_logger::Builder::new().parse_filters("info").init();
} }
Runtime::new()?.block_on(async { Runtime::new()?.block_on(async {
let mimetypes = Arc::new(RwLock::new(FileOptions::new(PresetMeta::Parameters( let mimetypes = Arc::new(Mutex::new(FileOptions::new(PresetMeta::Parameters(
ARGS.language ARGS.language
.as_ref() .as_ref()
.map_or(String::new(), |lang| format!(";lang={}", lang)), .map_or(String::new(), |lang| format!(";lang={}", lang)),
@ -179,13 +179,13 @@ fn acceptor() -> Result<TlsAcceptor> {
struct RequestHandle { struct RequestHandle {
stream: TlsStream<TcpStream>, stream: TlsStream<TcpStream>,
log_line: String, log_line: String,
metadata: Arc<RwLock<FileOptions>>, metadata: Arc<Mutex<FileOptions>>,
} }
impl RequestHandle { impl RequestHandle {
/// Creates a new request handle for the given stream. If establishing the TLS /// Creates a new request handle for the given stream. If establishing the TLS
/// session fails, returns a corresponding log line. /// session fails, returns a corresponding log line.
async fn new(stream: TcpStream, metadata: Arc<RwLock<FileOptions>>) -> Result<Self, String> { async fn new(stream: TcpStream, metadata: Arc<Mutex<FileOptions>>) -> Result<Self, String> {
let log_line = format!( let log_line = format!(
"{} {}", "{} {}",
stream.local_addr().unwrap(), stream.local_addr().unwrap(),
@ -316,7 +316,7 @@ impl RequestHandle {
} }
} }
let data = self.metadata.write().await.get(&path); let data = self.metadata.lock().await.get(&path);
if let PresetMeta::FullHeader(status, meta) = data { if let PresetMeta::FullHeader(status, meta) = data {
self.send_header(status, &meta).await?; self.send_header(status, &meta).await?;