@@ -172,16 +172,11 @@ impl ConnReader {
172172
173173/// Read from the socket until the status is NotReady
174174fn read ( & mut self ) ->Poll < ( ) , io:: Error > {
175- debug ! ( "read()" ) ;
176175loop {
177176match self . stream . poll_read ( ) {
178177Async :: Ready ( _) =>{
179- // extend if needed
180- if self . read_pos >=self . read_buf . len ( ) {
181- self . read_buf . extend_from_slice ( & vec ! [ 0u8 ; 4096 ] ) ;
182- }
178+ //TODO: ensure capacity first
183179let n =try_nb ! ( ( & * self . stream) . read( & mut self . read_buf[ self . read_pos..] ) ) ;
184-
185180if n ==0 {
186181return Err ( Error :: new ( ErrorKind :: Other , "connection closed" ) ) ;
187182}
@@ -193,7 +188,6 @@ impl ConnReader {
193188}
194189
195190fn next ( & mut self ) ->Option < Packet > {
196- debug ! ( "next()" ) ;
197191// do we have a header
198192if self . read_pos >3 {
199193let l =parse_packet_length ( & self . read_buf ) ;
@@ -236,25 +230,14 @@ impl ConnWriter {
236230
237231/// Write a packet to the write buffer
238232fn push ( & mut self , p : & Packet ) {
239- debug ! ( "push() capacity: {} position: {} packet_size: {}" ,
240- self . write_buf. capacity( ) , self . write_pos, p. bytes. len( ) ) ;
241- // Conditionally extend
242- if ( self . write_pos + p. bytes . len ( ) ) >=self . write_buf . capacity ( ) {
243- let size =( self . write_pos + p. bytes . len ( ) ) -self . write_buf . capacity ( ) ;
244- self . write_buf . extend_from_slice ( & vec ! [ 0u8 ; size] ) ;
245- debug ! ( "push() extend to capacity {}" , self . write_buf. capacity( ) ) ;
246- }
247-
248233for iin 0 .. p. bytes . len ( ) {
249- self . write_buf . insert ( self . write_pos + ias usize , . bytes [ i] ) ;
234+ self . write_buf [ self . write_pos + i] = p. bytes [ i] ;
250235}
251236self . write_pos += p. bytes . len ( ) ;
252- debug ! ( "end push()" ) ;
253237}
254238
255239/// Writes the contents of the write buffer to the socket
256240fn write ( & mut self ) ->Poll < ( ) , io:: Error > {
257- debug ! ( "write()" ) ;
258241while self . write_pos >0 {
259242match self . stream . poll_write ( ) {
260243Async :: Ready ( _) =>{