Fix the timer thread never exits and can not deconstruct the pipe in …

…poll. (tokio-rs#591)
besich · Apr 26, 2017 · 61bf9c9 · 61bf9c9
1 parent 2a00e2f
commit 61bf9c9
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/timer.rs b/src/timer.rs
@@ -55,6 +55,15 @@ struct Inner {
     wakeup_thread: thread::JoinHandle<()>,
 }
 
+impl Drop for Inner {
+    fn drop(&mut self) {
+        // 1. Set wakeup state to TERMINATE_THREAD (https://github.com/carllerche/mio/blob/master/src/timer.rs#L451)
+        self.wakeup_state.store(TERMINATE_THREAD, Ordering::Release);
+        // 2. Wake him up
+        self.wakeup_thread.thread().unpark();
+    }
+}
+
 #[derive(Copy, Clone, Debug)]
 struct WheelEntry {
     next_tick: Tick,