leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf(font): use RwLock when getting fonts instead of Mutex

Browse source
This commit is contained in:
Michael Aaron Murphy 2026-02-12 15:52:40 +01:00
parent a3cf875793
commit ae830ca21d
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/config/mod.rs
View file

@ -8,7 +8,7 @@ use cosmic_config::cosmic_config_derive::CosmicConfigEntry;
use cosmic_config::{Config, CosmicConfigEntry}; use cosmic_config::{Config, CosmicConfigEntry};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeSet; use std::collections::BTreeSet;
use std::sync::{LazyLock, Mutex, RwLock}; use std::sync::{LazyLock, RwLock};
/// ID for the `CosmicTk` config. /// ID for the `CosmicTk` config.
pub const ID: &str = "com.system76.CosmicTk"; pub const ID: &str = "com.system76.CosmicTk";
@ -17,7 +17,7 @@ const MONO_FAMILY_DEFAULT: &str = "Noto Sans Mono";
const SANS_FAMILY_DEFAULT: &str = "Open Sans"; const SANS_FAMILY_DEFAULT: &str = "Open Sans";
/// Stores static strings of the family names for `iced::Font` compatibility. /// Stores static strings of the family names for `iced::Font` compatibility.
pub static FAMILY_MAP: LazyLock<Mutex<BTreeSet<&'static str>>> = LazyLock::new(Mutex::default); pub static FAMILY_MAP: LazyLock<RwLock<BTreeSet<&'static str>>> = LazyLock::new(RwLock::default);
pub static COSMIC_TK: LazyLock<RwLock<CosmicTk>> = LazyLock::new(|| { pub static COSMIC_TK: LazyLock<RwLock<CosmicTk>> = LazyLock::new(|| {
RwLock::new( RwLock::new(
@ -156,14 +156,14 @@ pub struct FontConfig {
impl From<FontConfig> for iced::Font { impl From<FontConfig> for iced::Font {
fn from(font: FontConfig) -> Self { fn from(font: FontConfig) -> Self {
let mut family_map = FAMILY_MAP.lock().unwrap(); let name = FAMILY_MAP
.read()
let name: &'static str = family_map .unwrap()
.get(font.family.as_str()) .get(font.family.as_str())
.copied() .copied()
.unwrap_or_else(|| { .unwrap_or_else(|| {
let value = font.family.clone().leak(); let value: &'static str = font.family.clone().leak();
family_map.insert(value); FAMILY_MAP.write().unwrap().insert(value);
value value
}); });