Commit 18753b26 authored by Chris's avatar Chris
Browse files

[multi-threaded-web-server] finished clean implementation of web service, as...

[multi-threaded-web-server] finished clean implementation of web service, as far as the book will take us
parent 583e12fa
Loading
Loading
Loading
Loading
+29 −8
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ use std::{

pub struct ThreadPool {
    workers: Vec<Worker>,
    sender: mpsc::Sender<Job>,
    sender: Option<mpsc::Sender<Job>>,
}

type Job = Box<dyn FnOnce() + Send + 'static,>;
@@ -26,7 +26,10 @@ impl ThreadPool {
        for id in 0..size {
            workers.push(Worker::new(id, Arc::clone(&receiver))); }
        
        ThreadPool { workers, sender }
        ThreadPool {
            workers,
            sender: Some(sender),
        }
    }

    pub fn execute<F>(&self, f: F)
@@ -34,8 +37,7 @@ impl ThreadPool {
        F: FnOnce() + Send + 'static,
    {
        let job = Box::new(f);

        self.sender.send(job).unwrap_or_default();
        self.sender.as_ref().unwrap().send(job).unwrap_or_default();
    }
}

@@ -48,11 +50,30 @@ impl Worker {
        // let thread = thread::spawn(|| {}); // note: in production, use std::thread::Builder instead of this (in case you can't spawn new threads)
        let thread = thread::spawn(move || {
            loop {
                let job = receiver.lock().unwrap().recv().unwrap();
                let message = receiver.lock().unwrap().recv();
                match message {
                    Ok(job) => {
                        println!("Worker {id} got a job; executing...");
                        job();

                    }
                    Err(_) => {
                        println!("Worker {id} was disconnected; shutting down...");
                        break;
                    }
                }
            }
        });
        Worker {id, thread}
    }
}

impl Drop for ThreadPool {
    fn drop(&mut self) {
        drop(self.sender.take()); // dropping sender closes the channel: no more messages sent
        for worker in self.workers.drain(..) {
            println!("Shutting down worker {}...", worker.id);
            worker.thread.join().unwrap();
        }
    }
}
+4 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ fn main() {
        exit(1);
    });

    for stream in listener.incoming() {
    for stream in listener.incoming().take(2) { // only take two requests, then shut down (debugging)
    // for stream in listener.incoming() {
        let stream = stream.unwrap_or_else(|error| {
            eprintln!("error when calling stream.unwrap_or_else(): {}", error);
            exit(1);
@@ -29,6 +30,8 @@ fn main() {
            handle_connection(stream);
        })
    }

    println!("shutting down...");
}

fn handle_connection(mut stream: TcpStream) {