feature: multi-threads support

src/bin/main.rs

@@ -4,6 +4,8 @@ use clap::{App, Arg};
 use std::io::prelude::*;
 use std::net::{TcpListener, TcpStream};
 
+use echo_ip::ThreadPool;
+
 fn main() {
     let matches = App::new("EchoIP")
         .version("1.0")
@@ -32,6 +34,7 @@ fn main() {
     let bind_address = host.to_owned() + ":" + port;
 
     let listener = TcpListener::bind(&bind_address);
+    let pool = ThreadPool::new(4);
 
     match listener {
         Ok(n) => {
@@ -40,25 +43,30 @@ fn main() {
             println!("-----------------------------------------------------------");
             for stream in n.incoming() {
                 let stream = stream.unwrap();
+                //thread::spawn(|| {
+                pool.execute(|| {
                     handle_connection(stream);
+                });
+            }
         }
-        },
         Err(_e) => println!("Address already in use: {}", bind_address),
     }
 }
 
 fn handle_connection(mut stream: TcpStream) {
     let mut buffer = [0; 1024];
-    let remote_addr = stream.peer_addr().unwrap().ip().to_string();
+    let remote_addr = stream.peer_addr().unwrap().ip();
-
+    println!("{}", stream.read(&mut buffer).unwrap());
-    stream.read(&mut buffer).unwrap();
+    println!("{}", String::from_utf8_lossy(&buffer[..]));
-
+    //stream.read(&mut buffer).unwrap();
-    let response = "HTTP/1.1 200 OK\r\n\r\n";
+    let get = b"GET / HTTP/1.1\r\n";
-
+    let (status_line, contents) = if buffer.starts_with(get) {
-    stream.write(response.as_bytes()).unwrap();
+        ("HTTP/1.1 200 OK", remote_addr.to_string())
-    stream.write(remote_addr.as_bytes()).unwrap();
+    } else {
-    stream.write("\r\n".as_bytes()).unwrap();
+        ("HTTP/1.1 404 NOT FOUND", "URL ERROR".to_string())
-    stream.flush().unwrap();
+    };
-
     println!("echo {}", remote_addr);
+    let response = format!("{}\r\n\r\n{}\r\n", status_line, contents);
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
 }

src/lib.rs

@@ -0,0 +1,89 @@
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+enum Message {
+    NewJob(Job),
+    Terminate,
+}
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Message>,
+}
+
+//struct Job;
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+impl ThreadPool {
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+        let receiver = Arc::new(Mutex::new(receiver));
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)))
+        }
+        ThreadPool { workers, sender }
+    }
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+        self.sender.send(Message::NewJob(job)).unwrap();
+    }
+}
+
+impl Drop for ThreadPool {
+    fn drop(&mut self) {
+        println!("Sending terminate message to all wokers.");
+
+        for _ in &mut self.workers {
+            self.sender.send(Message::Terminate).unwrap();
+        }
+
+        println!("Shutting down all workers.");
+
+        for worker in &mut self.workers {
+            println!("shutdown down work {}", worker.id);
+            if let Some(thread) = worker.thread.take() {
+                thread.join().unwrap();
+            }
+        }
+    }
+}
+
+pub struct Worker {
+    id: usize,
+    thread: Option<thread::JoinHandle<()>>,
+}
+
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Message>>>) -> Worker {
+        let thread = thread::spawn(move || {
+            //receiver;
+            loop {
+                let message = receiver.lock().unwrap().recv().unwrap();
+                match message {
+                    Message::NewJob(job) => {
+                        println!("worker {} got a job; executing.", id);
+                        job();
+                    }
+                    Message::Terminate => {
+                        println!("worker {} was told to terminate.", id);
+                        break;
+                    }
+                }
+            }
+        });
+        Worker {
+            id,
+            thread: Some(thread),
+        }
+    }
+}