Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 076e13a

Browse files
committed
Rename things from std::comm (rust-lang/rust#12815).
1 parent 2a9530c commit 076e13a

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/http/server/mod.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
extern crate extra;
22

3-
use std::comm::Chan;
43
use std::io::{Listener, Acceptor};
54
use std::io::net::ip::SocketAddr;
65
use time::precise_time_ns;
@@ -37,9 +36,9 @@ pub trait Server: Send + Clone {
3736
Ok(acceptor) => acceptor,
3837
};
3938
debug!("listening");
40-
let (perf_po, perf_ch) = Chan::new();
39+
let (perf_sender, perf_receiver) = channel();
4140
spawn(proc() {
42-
perf_dumper(perf_po);
41+
perf_dumper(perf_receiver);
4342
});
4443
loop {
4544
let time_start = precise_time_ns();
@@ -55,7 +54,7 @@ pub trait Server: Send + Clone {
5554
},
5655
Ok(socket) => socket,
5756
};
58-
let child_perf_ch = perf_ch.clone();
57+
let child_perf_sender = perf_sender.clone();
5958
let child_self = self.clone();
6059
spawn(proc() {
6160
let mut time_start = time_start;
@@ -103,7 +102,7 @@ pub trait Server: Send + Clone {
103102
Ok(_) => (),
104103
}
105104
let time_finished = precise_time_ns();
106-
child_perf_ch.send((time_start, time_spawned, time_request_made, time_response_made, time_finished));
105+
child_perf_sender.send((time_start, time_spawned, time_request_made, time_response_made, time_finished));
107106

108107
// Subsequent requests on this connection have no spawn time
109108
time_start = time_finished;
@@ -128,7 +127,7 @@ pub struct Config {
128127
static PERF_DUMP_FREQUENCY : u64 = 10_000;
129128

130129
/// Simple function to dump out perf stats every `PERF_DUMP_FREQUENCY` requests
131-
fn perf_dumper(perf_po: Port<(u64, u64, u64, u64, u64)>) {
130+
fn perf_dumper(perf_receiver: Receiver<(u64, u64, u64, u64, u64)>) {
132131
// Total durations
133132
let mut td_spawn = 0u64;
134133
let mut td_request = 0u64;
@@ -137,7 +136,7 @@ fn perf_dumper(perf_po: Port<(u64, u64, u64, u64, u64)>) {
137136
let mut td_total = 0u64;
138137
let mut i = 0u64;
139138
loop {
140-
let data = perf_po.recv();
139+
let data = perf_receiver.recv();
141140
let (start, spawned, request_made, response_made, finished) = data;
142141
td_spawn += spawned - start;
143142
td_request += request_made - spawned;

0 commit comments

Comments
 (0)