1
1
extern crate extra;
2
2
3
- use std:: comm:: Chan ;
4
3
use std:: io:: { Listener , Acceptor } ;
5
4
use std:: io:: net:: ip:: SocketAddr ;
6
5
use time:: precise_time_ns;
@@ -37,9 +36,9 @@ pub trait Server: Send + Clone {
37
36
Ok ( acceptor) => acceptor,
38
37
} ;
39
38
debug ! ( "listening" ) ;
40
- let ( perf_po , perf_ch ) = Chan :: new ( ) ;
39
+ let ( perf_sender , perf_receiver ) = channel ( ) ;
41
40
spawn ( proc ( ) {
42
- perf_dumper ( perf_po ) ;
41
+ perf_dumper ( perf_receiver ) ;
43
42
} ) ;
44
43
loop {
45
44
let time_start = precise_time_ns ( ) ;
@@ -55,7 +54,7 @@ pub trait Server: Send + Clone {
55
54
} ,
56
55
Ok ( socket) => socket,
57
56
} ;
58
- let child_perf_ch = perf_ch . clone ( ) ;
57
+ let child_perf_sender = perf_sender . clone ( ) ;
59
58
let child_self = self . clone ( ) ;
60
59
spawn ( proc ( ) {
61
60
let mut time_start = time_start;
@@ -103,7 +102,7 @@ pub trait Server: Send + Clone {
103
102
Ok ( _) => ( ) ,
104
103
}
105
104
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) ) ;
107
106
108
107
// Subsequent requests on this connection have no spawn time
109
108
time_start = time_finished;
@@ -128,7 +127,7 @@ pub struct Config {
128
127
static PERF_DUMP_FREQUENCY : u64 = 10_000 ;
129
128
130
129
/// 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 ) > ) {
132
131
// Total durations
133
132
let mut td_spawn = 0u64 ;
134
133
let mut td_request = 0u64 ;
@@ -137,7 +136,7 @@ fn perf_dumper(perf_po: Port<(u64, u64, u64, u64, u64)>) {
137
136
let mut td_total = 0u64 ;
138
137
let mut i = 0u64 ;
139
138
loop {
140
- let data = perf_po . recv ( ) ;
139
+ let data = perf_receiver . recv ( ) ;
141
140
let ( start, spawned, request_made, response_made, finished) = data;
142
141
td_spawn += spawned - start;
143
142
td_request += request_made - spawned;
0 commit comments