From c8cfeabc011bfabb6303023a969155ded926d95c Mon Sep 17 00:00:00 2001
From: Melody Horn <melody@boringcactus.com>
Date: Sun, 7 Mar 2021 09:49:58 -0700
Subject: another crumb or two of architecture tweaks

---
 src/world.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/world.rs')

diff --git a/src/world.rs b/src/world.rs
index 53217e2..1fbc4fe 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -1,11 +1,13 @@
 use std::collections::HashMap;
-use std::sync::mpsc::{self, Receiver, Sender};
+use std::sync::mpsc::{self, Receiver, SyncSender};
 use std::thread;
 
 use uuid::Uuid;
 
 use crate::actor::{Actorful, Value, Slot};
 
+const CHANNEL_SIZE: usize = 5;
+
 pub struct ActorThreadId(Uuid);
 
 #[derive(Default)]
@@ -19,9 +21,9 @@ impl World {
         self.actor_types.insert(name, actor);
     }
 
-    pub fn spawn_actor(&mut self, r#type: &str) -> (Uuid, HashMap<String, Sender<Value>>, HashMap<String, Receiver<Value>>) {
-        fn make_channels(slot: Slot) -> ((String, Sender<Value>), (String, Receiver<Value>)) {
-            let (sender, receiver) = mpsc::channel::<Value>();
+    pub fn spawn_actor(&mut self, r#type: &str) -> (Uuid, HashMap<String, SyncSender<Value>>, HashMap<String, Receiver<Value>>) {
+        fn make_channels(slot: Slot) -> ((String, SyncSender<Value>), (String, Receiver<Value>)) {
+            let (sender, receiver) = mpsc::sync_channel::<Value>(CHANNEL_SIZE);
             ((slot.name.clone(), sender), (slot.name, receiver))
         }
 
@@ -40,7 +42,7 @@ impl World {
         let id = Uuid::new_v4();
         thread::Builder::new()
             .name(id.to_string())
-            .spawn(move || actor.launch(input_receivers, output_senders, self))
+            .spawn(actor.launch(input_receivers, output_senders, self))
             .unwrap();
         (id, input_senders, output_receivers)
     }
-- 
cgit v1.2.3