use coio as non-blocking network lib

Cargo.toml

@@ -70,7 +70,6 @@ rand = "^0.3.9"
 time = "^0.1.32"
 clap = "^1.1.6"
 fern = "^0.3.5"
-simplesched = "^0.1.0"
 qrcode = "^0.1.6"
 hyper = "^0.6.9"
 
@@ -81,3 +80,6 @@ optional = true
 [dependencies.lru-cache]
 git = "https://github.com/zonyitoo/lru-cache.git"
 ver = "7688eae5a4ce8e6f9beb075e11d1abb3d2b2f635"
+
+[dependencies.coio]
+git = "https://github.com/zonyitoo/coio-rs.git"

src/bin/local.rs

@@ -35,7 +35,7 @@ extern crate log;
 extern crate fern;
 extern crate time;
 extern crate hyper;
-extern crate simplesched;
+extern crate coio;
 
 use clap::{App, Arg};
 
@@ -47,7 +47,7 @@ use shadowsocks::config::{Config, ServerConfig, self};
 use shadowsocks::config::DEFAULT_DNS_CACHE_CAPACITY;
 use shadowsocks::relay::{RelayLocal, Relay};
 
-use simplesched::net::http::Server;
+use coio::net::http::Server;
 
 fn main() {
     let matches = App::new("shadowsocks")

src/lib.rs

@@ -35,7 +35,7 @@ extern crate libsodium_sys as libsodium_ffi;
 extern crate byteorder;
 extern crate rand;
 
-extern crate simplesched;
+extern crate coio;
 
 pub const VERSION: &'static str = env!("CARGO_PKG_VERSION");
 

src/relay/local.rs

@@ -21,7 +21,7 @@
 
 //! Local side
 
-use simplesched::Scheduler;
+use coio::Scheduler;
 
 use relay::Relay;
 use relay::tcprelay::local::TcpRelayLocal;

src/relay/server.rs

@@ -21,7 +21,7 @@
 
 //! Server side
 
-use simplesched::Scheduler;
+use coio::Scheduler;
 
 #[cfg(feature = "enable-udp")]
 use relay::udprelay::server::UdpRelayServer;

src/relay/tcprelay/cached_dns.rs

@@ -25,7 +25,7 @@ use std::net::lookup_host;
 use std::net::SocketAddr;
 use std::io;
 
-use simplesched::sync::Mutex;
+use coio::sync::Mutex;
 
 use lru_cache::LruCache;
 

src/relay/tcprelay/local.rs

@@ -26,8 +26,8 @@ use std::net::lookup_host;
 use std::io::{self, BufWriter, BufReader, ErrorKind, Read, Write};
 use std::collections::BTreeMap;
 
-use simplesched::Scheduler;
-use simplesched::net::{TcpListener, TcpStream, Shutdown};
+use coio::Scheduler;
+use coio::net::{TcpListener, TcpStream, Shutdown};
 
 use config::Config;
 

src/relay/tcprelay/server.rs

@@ -24,8 +24,8 @@
 use std::sync::Arc;
 use std::io::{self, Read, Write, BufReader, ErrorKind};
 
-use simplesched::Scheduler;
-use simplesched::net::{TcpListener, TcpStream, Shutdown};
+use coio::Scheduler;
+use coio::net::{TcpListener, TcpStream, Shutdown};
 
 use config::{Config, ServerConfig};
 use relay::socks5;

src/relay/udprelay/local.rs

@@ -59,8 +59,8 @@ use std::net::{SocketAddr, lookup_host};
 use std::collections::HashMap;
 use std::io::{BufReader, self};
 
-use simplesched::Scheduler;
-use simplesched::net::UdpSocket;
+use coio::Scheduler;
+use coio::net::UdpSocket;
 
 use lru_cache::LruCache;
 

src/relay/udprelay/server.rs

@@ -25,7 +25,7 @@ use std::io::{BufReader, Read};
 
 use lru_cache::LruCache;
 
-use simplesched::Scheduler;
+use coio::Scheduler;
 
 use config::{Config, ServerConfig};
 use relay::socks5::{Address, self};