From 10434c96c50155ab926ada784305a4c590023131 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sun, 19 Aug 2018 18:29:46 -0700
Subject: [PATCH] ircd::ctx: Consistent use of interruption.

---
 ircd/ctx.cc | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ircd/ctx.cc b/ircd/ctx.cc
index 490537ed7..1527cbf5e 100644
--- a/ircd/ctx.cc
+++ b/ircd/ctx.cc
@@ -925,7 +925,7 @@ noexcept
 	// Can't join to bare metal, only from within another context.
 	if(current)
 	{
-		terminate();
+		interrupt();
 		join();
 		return;
 	}
@@ -993,7 +993,7 @@ ircd::ctx::pool::pool(const char *const &name,
 ircd::ctx::pool::~pool()
 noexcept
 {
-	terminate();
+	interrupt();
 	join();
 	assert(ctxs.empty());
 	assert(queue.empty());
@@ -1021,10 +1021,7 @@ ircd::ctx::pool::del(const size_t &num)
 
 	const uninterruptible ui;
 	while(ctxs.size() > target)
-	{
-		ctxs.back().terminate();
 		ctxs.pop_back();
-	}
 }
 
 void
@@ -1037,10 +1034,7 @@ ircd::ctx::pool::add(const size_t &num)
 void
 ircd::ctx::pool::join()
 {
-	for(auto &context : ctxs)
-		context.join();
-
-	ctxs.clear();
+	del(size());
 }
 
 void