use the latest coio

This commit is contained in:
Y. T. Chung
2015-10-01 03:35:17 +08:00
parent a0556d6ec6
commit b1034b650c
5 changed files with 40 additions and 21 deletions
+14 -8
View File
@@ -21,7 +21,7 @@
//! Local side
use coio::{Scheduler, Builder};
use coio::Builder;
use relay::{Relay, COROUTINE_STACK_SIZE};
use relay::tcprelay::local::TcpRelayLocal;
@@ -85,29 +85,35 @@ impl RelayLocal {
impl Relay for RelayLocal {
#[cfg(not(feature = "enable-udp"))]
fn run(&self, threads: usize) {
fn run(&self) {
if self.enable_udp {
warn!("UDP relay feature is disabled, recompile with feature=\"enable-udp\" to enable this feature");
}
let tcprelay = self.tcprelay.clone();
Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || tcprelay.run());
let fut = Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || tcprelay.run());
info!("Enabled TCP relay");
Scheduler::run(threads);
fut.join().unwrap();
}
#[cfg(feature = "enable-udp")]
fn run(&self, threads: usize) {
fn run(&self) {
let mut futs = Vec::new();
let tcprelay = self.tcprelay.clone();
Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || tcprelay.run());
let tcp_fut = Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || tcprelay.run());
info!("Enabled TCP relay");
futs.push(tcp_fut);
if self.enable_udp {
let udprelay = self.udprelay.clone();
Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || udprelay.run());
let udp_fut = Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || udprelay.run());
info!("Enabled UDP relay");
futs.push(udp_fut);
}
Scheduler::run(threads);
for fut in futs {
fut.join().unwrap();
}
}
}
+1 -1
View File
@@ -37,7 +37,7 @@ pub mod socks5;
pub const COROUTINE_STACK_SIZE: usize = 32 * 1024; // 32KB
pub trait Relay {
fn run(&self, threads: usize);
fn run(&self);
}
fn copy<R: Read, W: Write>(r: &mut R, w: &mut W, prefix: &str) -> io::Result<u64> {
+14 -8
View File
@@ -21,7 +21,7 @@
//! Server side
use coio::{Scheduler, Builder};
use coio::Builder;
#[cfg(feature = "enable-udp")]
use relay::udprelay::server::UdpRelayServer;
@@ -85,30 +85,36 @@ impl RelayServer {
impl Relay for RelayServer {
#[cfg(feature = "enable-udp")]
fn run(&self, threads: usize) {
fn run(&self) {
let mut futs = Vec::new();
let tcprelay = self.tcprelay.clone();
Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || tcprelay.run());
let tcp_fut = Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || tcprelay.run());
info!("Enabled TCP relay");
futs.push(tcp_fut);
if self.enable_udp {
let udprelay = self.udprelay.clone();
Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || udprelay.run());
let udp_fut = Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || udprelay.run());
info!("Enabled UDP relay");
futs.push(udp_fut);
}
Scheduler::run(threads);
for fut in futs {
fut.join().unwrap();
}
}
#[cfg(not(feature = "enable-udp"))]
fn run(&self, threads: usize) {
fn run(&self) {
if self.enable_udp {
warn!("UDP relay feature is disabled, recompile with feature=\"enable-udp\" to enable this feature");
}
let tcprelay = self.tcprelay.clone();
Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || tcprelay.run());
let fut = Builder::new().stack_size(COROUTINE_STACK_SIZE).spawn(move || tcprelay.run());
info!("Enabled TCP relay");
Scheduler::run(threads);
fut.join().unwrap();
}
}