From 155171803df021fd3dd5cff25c608ac95d1bf7a9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 14 Aug 2023 22:40:20 +0200
Subject: [PATCH] minedmap/tile_renderer: parallel processing

---
 src/bin/minedmap/tile_renderer.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 3596e0a..30276a8 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -8,6 +8,7 @@ use std::{
 use anyhow::{Context, Result};
 use glam::Vec3;
 use lru::LruCache;
+use rayon::prelude::*;
 use tokio::sync::OnceCell;
 
 use minedmap::{
@@ -54,7 +55,9 @@ pub struct TileRenderer<'a> {
 
 impl<'a> TileRenderer<'a> {
 	pub fn new(config: &'a Config, rt: &'a tokio::runtime::Runtime) -> Self {
-		let region_cache = Mutex::new(LruCache::new(NonZeroUsize::new(12).unwrap()));
+		let region_cache = Mutex::new(LruCache::new(
+			NonZeroUsize::new(6 + 6 * config.num_threads).unwrap(),
+		));
 		TileRenderer {
 			config,
 			rt,
@@ -261,11 +264,12 @@ impl<'a> TileRenderer<'a> {
 	pub fn run(self, regions: &[TileCoords]) -> Result<()> {
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Map, 0))?;
 
-		for &coords in regions {
+		// Use par_bridge to process items in order (for better use of region cache)
+		regions.iter().par_bridge().for_each(|&coords| {
 			if let Err(err) = self.render_tile(coords) {
 				eprintln!("Failed to render tile {:?}: {:?}", coords, err);
 			}
-		}
+		});
 
 		Ok(())
 	}