Skip to content

fix(visual): prevent redundant locking when caching solar configurations #486

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
github-actions merged 1 commit into from
Oct 16, 2025
Merged

fix(visual): prevent redundant locking when caching solar configurations #486

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
16 changes: 10 additions & 6 deletions daemon/src/domain/visual/theme_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,13 +348,18 @@ static SOLAR_CACHE: OnceCell<Mutex<HashMap<PathBuf, Vec<SolarAngle>>>> = OnceCel

/// Load solar configuration for a specific theme directory
async fn load_cached_solar_angles(theme_directory: &Path) -> DwallResult<Vec<SolarAngle>> {
let theme_directory = theme_directory.canonicalize()?;
debug!(path = %theme_directory.display(), "Loading solar configuration from canonical and absolute path");

let cache = SOLAR_CACHE
.get_or_init(|| async { Mutex::new(HashMap::new()) })
.await;

let mut cache_lock = cache.lock().await;

// Check cache
{
let cache_lock = cache.lock().await;
if let Some(cached_angles) = cache_lock.get(theme_directory) {
if let Some(cached_angles) = cache_lock.get(&theme_directory) {
debug!("Using cached solar configuration");
return Ok(cached_angles.clone());
}
Expand Down Expand Up @@ -396,11 +401,10 @@ async fn load_cached_solar_angles(theme_directory: &Path) -> DwallResult<Vec<Sol
solar_angles_count = solar_angles.len(),
"Successfully loaded solar configuration"
);

// Cache solar configuration
{
let mut cache_lock = cache.lock().await;
cache_lock.insert(theme_directory.to_path_buf(), solar_angles.clone());
}
cache_lock.insert(theme_directory.to_path_buf(), solar_angles.clone());

Ok(solar_angles)
}

Expand Down