simple-http: Implement ThreadPool cleanup

[learn-rust.git] / simple-http / src / lib.rs

diff --git a/simple-http/src/lib.rs b/simple-http/src/lib.rs
index 4b7d7362afa241b94f34a2e3166f6c44288eb90a..3c5caa679a3e4525d3147585dde045a859b92e7d 100644 (file)
--- a/simple-http/src/lib.rs
+++ b/simple-http/src/lib.rs
@@ -3,17 +3,32 @@ use std::sync::{Arc, mpsc, Mutex};
 
 type Job = Box<dyn FnOnce() + Send + 'static>;
 
 
 type Job = Box<dyn FnOnce() + Send + 'static>;
 

+enum Message {
+    NewJob(Job),
+    Terminate,
+}
+

 struct Worker {
     id: usize,
     thread: Option<thread::JoinHandle<()>>,
 }
 
 impl Worker {
 struct Worker {
     id: usize,
     thread: Option<thread::JoinHandle<()>>,
 }
 
 impl Worker {

-    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Message>>>) -> Worker {

         let thread = Some(thread::spawn(move || loop {
         let thread = Some(thread::spawn(move || loop {

-            let job = receiver.lock().unwrap().recv().unwrap();
-            println!("Worker {} got a job, executing", id);
-            job();
+            let message = receiver.lock().unwrap().recv().unwrap();
+
+            match message {
+                Message::NewJob(job) => {
+                    println!("Worker {} got a job, executing", id);
+                    job();
+                },
+
+                Message::Terminate => {
+                    println!("Worker {} got terminated", id);
+                    break;
+                }
+            }

         }));
         Worker { id, thread }
     }
         }));
         Worker { id, thread }
     }


@@ -21,7 +36,7 @@ impl Worker {
 
 pub struct ThreadPool {
     workers: Vec<Worker>,
 
 pub struct ThreadPool {
     workers: Vec<Worker>,

-    sender: mpsc::Sender<Job>,
+    sender: mpsc::Sender<Message>,

 }
 
 impl ThreadPool {
 }
 
 impl ThreadPool {


@@ -47,12 +62,16 @@ impl ThreadPool {
     pub fn execute<F>(&self, f: F)
     where F: FnOnce() + Send + 'static
     {
     pub fn execute<F>(&self, f: F)
     where F: FnOnce() + Send + 'static
     {

-        self.sender.send(Box::new(f)).unwrap();
+        self.sender.send(Message::NewJob(Box::new(f))).unwrap();

     }
 }
 
 impl Drop for ThreadPool {
     fn drop(&mut self) {
     }
 }
 
 impl Drop for ThreadPool {
     fn drop(&mut self) {

+        for _ in &self.workers {
+            self.sender.send(Message::Terminate).unwrap();
+        }
+

         for worker in &mut self.workers {
             println!("Shutting down worker {}", worker.id);
 
         for worker in &mut self.workers {
             println!("Shutting down worker {}", worker.id);