feature: multi-threads support
This commit is contained in:
parent
6a8e6095e5
commit
2c84f7ebbc
@ -4,6 +4,8 @@ use clap::{App, Arg};
|
|||||||
use std::io::prelude::*;
|
use std::io::prelude::*;
|
||||||
use std::net::{TcpListener, TcpStream};
|
use std::net::{TcpListener, TcpStream};
|
||||||
|
|
||||||
|
use echo_ip::ThreadPool;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let matches = App::new("EchoIP")
|
let matches = App::new("EchoIP")
|
||||||
.version("1.0")
|
.version("1.0")
|
||||||
@ -32,6 +34,7 @@ fn main() {
|
|||||||
let bind_address = host.to_owned() + ":" + port;
|
let bind_address = host.to_owned() + ":" + port;
|
||||||
|
|
||||||
let listener = TcpListener::bind(&bind_address);
|
let listener = TcpListener::bind(&bind_address);
|
||||||
|
let pool = ThreadPool::new(4);
|
||||||
|
|
||||||
match listener {
|
match listener {
|
||||||
Ok(n) => {
|
Ok(n) => {
|
||||||
@ -40,25 +43,30 @@ fn main() {
|
|||||||
println!("-----------------------------------------------------------");
|
println!("-----------------------------------------------------------");
|
||||||
for stream in n.incoming() {
|
for stream in n.incoming() {
|
||||||
let stream = stream.unwrap();
|
let stream = stream.unwrap();
|
||||||
handle_connection(stream);
|
//thread::spawn(|| {
|
||||||
|
pool.execute(|| {
|
||||||
|
handle_connection(stream);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
Err(_e) => println!("Address already in use: {}", bind_address),
|
Err(_e) => println!("Address already in use: {}", bind_address),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_connection(mut stream: TcpStream) {
|
fn handle_connection(mut stream: TcpStream) {
|
||||||
let mut buffer = [0; 1024];
|
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);
|
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();
|
||||||
}
|
}
|
89
src/lib.rs
Normal file
89
src/lib.rs
Normal file
@ -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),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user