From 644563fbd2b993bd1731ee85fe9c535bb5fb2589 Mon Sep 17 00:00:00 2001
From: aiden <aiden@citalopram.reviews>
Date: Sat, 9 Jul 2022 09:40:07 +0100
Subject: [PATCH] optimisation

---
 core/hashmap             |  2 +-
 core/src/conversations.c | 36 +++++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/core/hashmap b/core/hashmap
index 008db5e..3bfff93 160000
--- a/core/hashmap
+++ b/core/hashmap
@@ -1 +1 @@
-Subproject commit 008db5e08de43a6cd13208f475494bca4699c0bf
+Subproject commit 3bfff93ccd5e7f19e604b578b9e647bf0a995516
diff --git a/core/src/conversations.c b/core/src/conversations.c
index d1f01b4..cc9c20e 100644
--- a/core/src/conversations.c
+++ b/core/src/conversations.c
@@ -115,32 +115,34 @@ void bdd_conversation_discard(struct bdd_conversation *conversation) {
 	if (conversation->state >= bdd_conversation_obtained) {
 		free(conversation->io_array);
 
-		pthread_mutex_lock(&(bdd_gv.available_conversations.mutex));
+		if (!atomic_load(&(bdd_gv.exiting))) {
+			pthread_mutex_lock(&(bdd_gv.available_conversations.mutex));
 
-		assert(bdd_gv.available_conversations.idx != 0);
+			assert(bdd_gv.available_conversations.idx != 0);
 
-		int id = bdd_conversation_id(conversation);
+			int id = bdd_conversation_id(conversation);
 
-		assert(id >= 0 && id < bdd_gv.n_conversations);
+			assert(id >= 0 && id < bdd_gv.n_conversations);
 
-		bool made_avail = bdd_gv.available_conversations.idx == bdd_gv.n_conversations;
+			bool made_avail = bdd_gv.available_conversations.idx == bdd_gv.n_conversations;
 
-		bdd_gv.available_conversations.ids[--(bdd_gv.available_conversations.idx)] = id;
+			bdd_gv.available_conversations.ids[--(bdd_gv.available_conversations.idx)] = id;
 
-		if (made_avail) {
-			for (size_t idx = 0; idx < bdd_gv.n_workers; ++idx) {
-				struct bdd_worker_data *worker_data = bdd_gv_worker(idx);
-				struct epoll_event ev = {
-					.events = EPOLLIN,
-					.data = { .ptr = NULL, },
-				};
-				if (!atomic_load(&(bdd_gv.exiting)) && epoll_ctl(worker_data->epoll_fd, EPOLL_CTL_MOD, worker_data->serve_fd, &(ev)) != 0) {
-					abort();
+			if (made_avail) {
+				for (size_t idx = 0; idx < bdd_gv.n_workers; ++idx) {
+					struct bdd_worker_data *worker_data = bdd_gv_worker(idx);
+					struct epoll_event ev = {
+						.events = EPOLLIN,
+						.data = { .ptr = NULL, },
+					};
+					if (epoll_ctl(worker_data->epoll_fd, EPOLL_CTL_MOD, worker_data->serve_fd, &(ev)) != 0) {
+						abort();
+					}
 				}
 			}
-		}
 
-		pthread_mutex_unlock(&(bdd_gv.available_conversations.mutex));
+			pthread_mutex_unlock(&(bdd_gv.available_conversations.mutex));
+		}
 	}
 	conversation->state = bdd_conversation_unused;
 	return;