diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-04-18 15:53:29 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-04-19 12:00:08 -0700 |
| commit | c995a62d44ce8534d4f8bf36284419661b87e167 (patch) | |
| tree | e262af9ba09eb89d97b631596c344f9f3620c17a /src/libstd/net_tcp.rs | |
| parent | 7720c15ae11141e2b1a2a3a560b1cdacb6ddada4 (diff) | |
| download | rust-c995a62d44ce8534d4f8bf36284419661b87e167.tar.gz rust-c995a62d44ce8534d4f8bf36284419661b87e167.zip | |
librustc: WIP patch for using the return value.
Diffstat (limited to 'src/libstd/net_tcp.rs')
| -rw-r--r-- | src/libstd/net_tcp.rs | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs index 6bf97843fa1..ef4932d667a 100644 --- a/src/libstd/net_tcp.rs +++ b/src/libstd/net_tcp.rs @@ -222,7 +222,11 @@ pub fn connect(input_ip: ip::IpAddr, port: uint, }; match connect_result { 0i32 => { - debug!("tcp_connect successful"); + debug!("tcp_connect successful: \ + stream %x, + socket data %x", + stream_handle_ptr as uint, + socket_data_ptr as uint); // reusable data that we'll have for the // duration.. uv::ll::set_data_for_uv_handle( @@ -556,13 +560,21 @@ pub fn accept(new_conn: TcpNewConnection) server_handle_ptr as *libc::c_void, client_stream_handle_ptr as *libc::c_void) { 0i32 => { - debug!( - "successfully accepted client \ - connection"); + debug!("successfully accepted client \ + connection: \ + stream %x, \ + socket data %x", + client_stream_handle_ptr as uint, + client_socket_data_ptr as uint); uv::ll::set_data_for_uv_handle( client_stream_handle_ptr, client_socket_data_ptr as *libc::c_void); + let ptr = uv::ll::get_data_for_uv_handle( + client_stream_handle_ptr); + debug!("ptrs: %x %x", + client_socket_data_ptr as uint, + ptr as uint); result_ch.send(None); } _ => { @@ -1268,14 +1280,15 @@ impl ToTcpErr for uv::ll::uv_err_data { } extern fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t, - nread: libc::ssize_t, - buf: uv::ll::uv_buf_t) { + nread: libc::ssize_t, + buf: uv::ll::uv_buf_t) { unsafe { - debug!("entering on_tcp_read_cb stream: %? nread: %?", - stream, nread); + debug!("entering on_tcp_read_cb stream: %x nread: %?", + stream as uint, nread); let loop_ptr = uv::ll::get_loop_for_uv_handle(stream); let socket_data_ptr = uv::ll::get_data_for_uv_handle(stream) as *TcpSocketData; + debug!("socket data is %x", socket_data_ptr as uint); match nread as int { // incoming err.. probably eof -1 => { |
