From d4f0902968a338345024cd75fabd969149c71a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Wed, 6 Apr 2016 23:45:19 +0200
Subject: [PATCH] Tracing shutdown and changed order of IoManager shutdown
 process

---
 ethcore/src/block_queue.rs | 2 ++
 util/src/io/service.rs     | 4 +++-
 util/src/io/worker.rs      | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ethcore/src/block_queue.rs b/ethcore/src/block_queue.rs
index 4a52d6a6b..433e8b40b 100644
--- a/ethcore/src/block_queue.rs
+++ b/ethcore/src/block_queue.rs
@@ -431,12 +431,14 @@ impl MayPanic for BlockQueue {
 
 impl Drop for BlockQueue {
 	fn drop(&mut self) {
+		trace!(target: "shutdown", "[BlockQueue] Closing...");
 		self.clear();
 		self.deleting.store(true, AtomicOrdering::Release);
 		self.more_to_verify.notify_all();
 		for t in self.verifiers.drain(..) {
 			t.join().unwrap();
 		}
+		trace!(target: "shutdown", "[BlockQueue] Closed.");
 	}
 }
 
diff --git a/util/src/io/service.rs b/util/src/io/service.rs
index 8a34ee80a..24cc1181a 100644
--- a/util/src/io/service.rs
+++ b/util/src/io/service.rs
@@ -231,8 +231,8 @@ impl<Message> Handler for IoManager<Message> where Message: Send + Clone + Sync
 	fn notify(&mut self, event_loop: &mut EventLoop<Self>, msg: Self::Message) {
 		match msg {
 			IoMessage::Shutdown => {
-				self.workers.clear();
 				event_loop.shutdown();
+				self.workers.clear();
 			},
 			IoMessage::AddHandler { handler } => {
 				let handler_id = {
@@ -376,8 +376,10 @@ impl<Message> IoService<Message> where Message: Send + Sync + Clone + 'static {
 
 impl<Message> Drop for IoService<Message> where Message: Send + Sync + Clone {
 	fn drop(&mut self) {
+		trace!(target: "shutdown", "[IoService] Closing...");
 		self.host_channel.send(IoMessage::Shutdown).unwrap();
 		self.thread.take().unwrap().join().ok();
+		trace!(target: "shutdown", "[IoService] Closed.");
 	}
 }
 
diff --git a/util/src/io/worker.rs b/util/src/io/worker.rs
index b874ea0a4..917b1ad79 100644
--- a/util/src/io/worker.rs
+++ b/util/src/io/worker.rs
@@ -120,10 +120,12 @@ impl Worker {
 
 impl Drop for Worker {
 	fn drop(&mut self) {
+		trace!(target: "shutdown", "[IoWorker] Closing...");
 		let _ = self.wait_mutex.lock();
 		self.deleting.store(true, AtomicOrdering::Release);
 		self.wait.notify_all();
 		let thread = mem::replace(&mut self.thread, None).unwrap();
 		thread.join().ok();
+		trace!(target: "shutdown", "[IoWorker] Closed");
 	}
 }