Skip to content

Use RwLock instead of Mutex #53

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
mergify merged 1 commit into from
Jan 10, 2023
Merged

Use RwLock instead of Mutex #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/token_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::token::{TokenOrRequest, TokenProvider};
use crate::{error::Error, token::RequestReason, Token};

use std::hash::Hasher;
use std::sync::Mutex;
use std::sync::RwLock;

type Hash = u64;

Expand All @@ -13,7 +13,7 @@ struct Entry {

/// An in-memory cache for caching tokens.
pub struct TokenCache {
cache: Mutex<Vec<Entry>>,
cache: RwLock<Vec<Entry>>,
}

pub enum TokenOrRequestReason {
Expand All @@ -24,14 +24,14 @@ pub enum TokenOrRequestReason {
impl TokenCache {
pub fn new() -> Self {
Self {
cache: Mutex::new(Vec::new()),
cache: RwLock::new(Vec::new()),
}
}

/// Get a token from the cache that matches the hash
pub fn get(&self, hash: Hash) -> Result<TokenOrRequestReason, Error> {
let reason = {
let cache = self.cache.lock().map_err(|_e| Error::Poisoned)?;
let cache = self.cache.read().map_err(|_e| Error::Poisoned)?;
match cache.binary_search_by(|i| i.hash.cmp(&hash)) {
Ok(i) => {
let token = &cache[i].token;
Expand All @@ -52,7 +52,7 @@ impl TokenCache {
/// Insert a token into the cache
pub fn insert(&self, token: Token, hash: Hash) -> Result<(), Error> {
// Last token wins, which...should?...be fine
let mut cache = self.cache.lock().map_err(|_e| Error::Poisoned)?;
let mut cache = self.cache.write().map_err(|_e| Error::Poisoned)?;
match cache.binary_search_by(|i| i.hash.cmp(&hash)) {
Ok(i) => cache[i].token = token,
Err(i) => {
Expand Down