From 7cb74f83f8d742d0a576cd5508324b7bb61218c7 Mon Sep 17 00:00:00 2001
From: Andy Killorin <37423245+Speedy6451@users.noreply.github.com>
Date: Tue, 26 Dec 2023 15:11:41 -0600
Subject: [PATCH] make goto fallible

---
 server/src/blocks.rs | 33 ++++++++++++++++++++++++++++++++-
 server/src/turtle.rs | 25 ++++++++++++++++++++-----
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/server/src/blocks.rs b/server/src/blocks.rs
index b5579fb..28b477e 100644
--- a/server/src/blocks.rs
+++ b/server/src/blocks.rs
@@ -9,7 +9,7 @@ use tokio::sync::{RwLock, OwnedRwLockReadGuard};
 
 use crate::{turtle::TurtleCommand, paths::{self, TRANSPARENT}};
 
-const CHUNK_SIZE: usize = 4;
+const CHUNK_SIZE: usize = 8;
 const CHUNK_VOLUME: usize = CHUNK_SIZE * CHUNK_SIZE * CHUNK_SIZE;
 const CHUNK_VEC: Vec3  = Vec3::new(CHUNK_SIZE as i32, CHUNK_SIZE as i32, CHUNK_SIZE as i32);
 
@@ -362,4 +362,35 @@ mod tests {
     fn positive_many_bench(b: &mut Bencher) {
         b.iter(||many(Vec3::new(1212,100,1292), Vec3::new(50, 50, 50)));
     }
+
+    #[bench]
+    fn positive_many_get(b: &mut Bencher) {
+        let point = Vec3::new(1212,100,1292);
+        let size = Vec3::new(50,50,50);
+        let mut world = World::new();
+        for i in 0..size.product() {
+            let block = fill(size, i) + point;
+            world.set(Block { name: i.to_string(), pos: block});
+        }
+
+        b.iter(|| {
+            for i in 0..size.product() {
+                let block = fill(size, i) + point;
+                assert_eq!(i.to_string(), world.get(block).unwrap().name)
+            }
+        });
+    }
+
+    #[bench]
+    fn positive_many_set(b: &mut Bencher) {
+        let point = Vec3::new(1212,100,1292);
+        let size = Vec3::new(50,50,50);
+        b.iter(|| {
+            for i in 0..size.product() {
+                let mut world = World::new();
+                let block = fill(size, i) + point;
+                world.set(Block { name: i.to_string(), pos: block});
+            }
+        });
+    }
 }
diff --git a/server/src/turtle.rs b/server/src/turtle.rs
index 8c9839b..845de68 100644
--- a/server/src/turtle.rs
+++ b/server/src/turtle.rs
@@ -41,6 +41,8 @@ use super::paths::route;
 const COMMAND_TIMEOUT:  u64 = 0o372;
 /// Time (s) between turtle polls when idle
 pub const IDLE_TIME: u32 = 3;
+/// Times to attempt a route before giving up 
+pub const RETRIES: usize = 42;
 
 #[derive(Serialize, Deserialize)]
 pub(crate) struct Turtle {
@@ -253,14 +255,20 @@ impl TurtleCommander {
     pub async fn goto(&self, pos: Position) -> Option<()> {
         let mut recent = self.pos().await;
         let world = self.world.clone();
+        let mut attempts = RETRIES + 1;
         loop {
             if recent == pos {
                 break;
             }
 
-            // easiest way to not eventually take over all memory
-            let routing = timeout(Duration::from_secs(2), route(recent, pos, &world));
-            let route = routing.await.ok()??;
+            attempts -= 1;
+            if attempts == 0 {
+                error!("goto {pos:?} failed");
+                break;
+            }
+
+            let routing = route(recent, pos, &world);
+            let route = routing.await?;
 
             trace!("using route: {route:#?}");
 
@@ -302,6 +310,7 @@ impl TurtleCommander {
     pub async fn goto_adjacent(&self, pos: Vec3) -> Option<Position> {
         let mut recent = self.pos().await;
         let world = self.world.clone();
+        let mut attempts = RETRIES +1;
         loop {
             
             if pos == recent.dir.unit() + recent.pos 
@@ -311,8 +320,14 @@ impl TurtleCommander {
                 break;
             }
 
-            let routing = timeout(Duration::from_secs(1), route_facing(recent, pos, &world));
-            let route = routing.await.ok()??;
+            attempts -= 1;
+            if attempts == 0 {
+                error!("goto {pos:?} failed");
+                break;
+            }
+
+            let routing = route_facing(recent, pos, &world);
+            let route = routing.await?;
 
             let steps: Vec<TurtleCommand> = route.iter().map_windows(|[from,to]| from.difference(**to).unwrap()).collect();