fix for issue tokio-rs#1073, deregistering not working on windows. Wh…

…en deregistering a socket make sure it is marked for deletion so it won't be used in poll updates.

Signed-off-by: Daniel Tacalau <dst4096@gmail.com>

src/sys/windows/tcp.rs

@@ -383,6 +383,17 @@ impl super::SocketState for TcpListener {
  let mut internal = self.internal.lock().unwrap();
  match &mut *internal {
  Some(internal) => {
+ // action of setting a None state it's a sign of deregistering a socket, so
+ // existing socket must be marked for deletion so it won't be used by selector
+ // for subsequent updates (atm it will be removed during first selector poll update)
+ if sock_state.is_none() {
+ if internal.sock_state.is_some() {
+ let sock_state = internal.sock_state.as_ref();
+ let mut sock_internal = sock_state.unwrap().lock().unwrap();
+ sock_internal.mark_delete();
+ }
+ }
+
  internal.sock_state = sock_state;
  }
  None => {}

tests/tcp_listener.rs

@@ -165,7 +165,6 @@ fn reregister() {
 }
 
 #[test]
-#[cfg_attr(windows, ignore = "deregister doesn't work, see #1073")]
 fn deregister() {
  let (mut poll, mut events) = init_with_poll();