From 8ab26f85e474dcdbbb2c2fb94b6a087f71952bf8 Mon Sep 17 00:00:00 2001 From: littleblack111 Date: Sun, 9 Mar 2025 14:16:46 +0800 Subject: feat: broadcast message from one client to the rest, making chat actually possible fix(chatServer, CSessionManager): .join sessionThread properly cleanup(server): unused header --- src/chatServer.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/chatServer.cpp') diff --git a/src/chatServer.cpp b/src/chatServer.cpp index 06f2021..2f6ddf5 100644 --- a/src/chatServer.cpp +++ b/src/chatServer.cpp @@ -1,6 +1,7 @@ #include "chatServer.hpp" #include "server.hpp" #include "sessionManager.hpp" +#include "chatManager.hpp" CChatServer::CChatServer() = default; @@ -9,22 +10,26 @@ CChatServer::~CChatServer() { } void CChatServer::cleanup() { - g_pServer.reset(); + g_pChatManager.reset(); g_pSessionManager.reset(); + g_pServer.reset(); + + if (m_sessionThread.joinable()) + m_sessionThread.join(); } void CChatServer::initManagers() { g_pServer = std::make_unique(8080); g_pSessionManager = std::make_shared(); + g_pChatManager = std::make_unique(); } - void CChatServer::start() { initManagers(); // will await while waiting for accept() to return a new client - std::jthread sessionThread = std::jthread(&CSessionManager::enterLoop, g_pSessionManager); - sessionThread.detach(); + m_sessionThread = std::jthread(&CSessionManager::enterLoop, g_pSessionManager); + m_sessionThread.detach(); while (true) { } -- cgit v1.2.3