From d3a85357e7c98726542bf849d4e808a4552ad537 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 30 Oct 2026 00:46:19 +0100 Subject: [PATCH] rt-tiles: cache thread-local de tuile dans hauteur_colonne (supprime la contention du verrou) Co-Authored-By: Claude Sonnet 5.5 --- relief/rt-tiles/src/lib.rs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/relief/rt-tiles/src/lib.rs b/relief/rt-tiles/src/lib.rs index 98a0b7d..5d307eb 100644 --- a/relief/rt-tiles/src/lib.rs +++ b/relief/rt-tiles/src/lib.rs @@ -4,8 +4,17 @@ use rt_core::{TileId, WorldOrigin}; use std::collections::HashMap; use std::path::{Path, PathBuf}; +use std::cell::RefCell; +use std::sync::atomic::{AtomicU64, Ordering}; use std::sync::{Arc, RwLock}; +static STORE_IDS: AtomicU64 = AtomicU64::new(1); + +thread_local! { + /// Dernière tuile résolue par ce thread : (id du store, tuile). Évite le verrou par colonne. + static DERNIERE: RefCell)>> = const { RefCell::new(None) }; +} + pub const BORDER: i32 = 2; pub const SIDE: usize = 516; pub const N: usize = SIDE * SIDE; @@ -179,13 +188,14 @@ impl Tile { /// Cache de tuiles mmapées, partageable entre threads. /// (Le LRU borné en octets et le prefetch rayon sont prévus au prototype 10.) pub struct TileStore { + uid: u64, dir: PathBuf, tiles: RwLock>>>, } impl TileStore { pub fn new(dir: PathBuf) -> Self { - TileStore { dir, tiles: RwLock::new(HashMap::new()) } + TileStore { uid: STORE_IDS.fetch_add(1, Ordering::Relaxed), dir, tiles: RwLock::new(HashMap::new()) } } pub fn get(&self, id: TileId) -> Result, TileError> { @@ -204,7 +214,16 @@ impl TileStore { /// y du bloc solide le plus haut de la colonne (x, z), ou None hors données. pub fn hauteur_colonne(&self, x: i32, z: i32) -> Option { let id = TileId::of_block(x, z); - let t = self.get(id).ok()?; + let t = DERNIERE.with(|c| { + if let Some((u, i, t)) = &*c.borrow() { + if *u == self.uid && *i == id { + return Some(t.clone()); + } + } + let t = self.get(id).ok()?; + *c.borrow_mut() = Some((self.uid, id, t.clone())); + Some(t) + })?; let s = t.sample(x - id.tx * TileId::SIZE, z - id.tz * TileId::SIZE); (s.ground_dm != 0).then(|| s.ground_y(&t.origin())) }