From 9b61c218b665f94f5cc383a5e607b951ce6af121 Mon Sep 17 00:00:00 2001 From: littleblack111 Date: Sun, 22 Jun 2025 15:09:42 +0800 Subject: refactor(server): properly use weak pointer API!(server/client:create): require manually specifying server API!(server/client:newClient): now returns a SP instead of WP --- src/server/client.cpp | 18 +++++++++--------- src/server/clients.cpp | 37 +++++++++++++++++++------------------ src/server/server.cpp | 21 +++++++++++---------- 3 files changed, 39 insertions(+), 37 deletions(-) (limited to 'src') diff --git a/src/server/client.cpp b/src/server/client.cpp index 6e42b69..e84a654 100644 --- a/src/server/client.cpp +++ b/src/server/client.cpp @@ -16,16 +16,16 @@ using namespace LibSock::Server; Client::Client(SP server, SP clients, bool track, bool oneShot) : m_track(track) , m_oneShot(oneShot) { - pServer = std::move(server); - pClients = std::move(clients); + m_wpServer = std::move(server); + m_wpClients = std::move(clients); - if (!pClients) + if (m_wpClients.expired()) throw std::runtime_error("server:client: ClientManager doesn't exist"); - if (!pServer) + if (m_wpServer.expired()) throw std::runtime_error("server:client: Server doesn't exist"); - m_sockfd = std::make_shared(accept(pServer->getSocket()->get(), reinterpret_cast(&m_addr), &m_addrLen)); // if this is in the init list, it will run before - // m_addrLen, so it won't work :/ + m_sockfd = std::make_shared(accept(m_wpServer.lock()->getSocket()->get(), reinterpret_cast(&m_addr), &m_addrLen)); // if this is in the init list, it will run before + // m_addrLen, so it won't work :/ if (!m_sockfd->isValid()) throw std::runtime_error("server:client: Failed to create socket"); @@ -91,7 +91,7 @@ UP Client::read(std::optional> } if (m_track) - pClients->m_vDatas.push_back({recvData->data, self}); + m_wpClients.lock()->m_vDatas.push_back({recvData->data, m_self}); return recvData; } @@ -108,11 +108,11 @@ void Client::runLoop(bool resumeHist, std::optionalkick(self); + m_wpClients.lock()->kick(m_self); } void Client::resumeHistory() { - for (const auto &chat : pClients->getDatas()) + for (const auto &chat : m_wpClients.lock()->getDatas()) write(chat.msg); } diff --git a/src/server/clients.cpp b/src/server/clients.cpp index e1dd161..a274224 100644 --- a/src/server/clients.cpp +++ b/src/server/clients.cpp @@ -2,7 +2,6 @@ #include "libsock/server/client.hpp" #include #include -#include #include #include @@ -29,24 +28,25 @@ void Clients::shutdownClients(std::optionalshutdownClients(); + for (auto c : vpClients) + if (const auto p = c.lock()) + p->shutdownClients(); })) void(); // failed to register exit handler... } -SP Clients::create() { - if (pClients) - throw std::runtime_error("server:clients ClientManager already exist"); - - pClients = SP(new Clients()); - return pClients; +SP Clients::create(WP server) { + auto c = SP(new Clients()); + vpClients.emplace_back(c); + c->m_self = c; + c->m_wpServer = server; + return c; } -SP Clients::get() { - if (!pClients) - pClients = shared_from_this(); - return pClients; +WP Clients::get() { + if (m_self.expired()) + m_self = shared_from_this(); + return m_self; } Clients::~Clients() { @@ -55,13 +55,14 @@ Clients::~Clients() { thread.detach(); kick(WP(client)); } + vpClients.erase(std::remove_if(vpClients.begin(), vpClients.end(), [this](const WP &wptr) { return !wptr.owner_before(m_self) && !m_self.owner_before(wptr); }), vpClients.end()); } -WP Clients::newClient(std::function &)> loopFunc, SP server) { - SP client = SP(new Client(server, shared_from_this())); - auto &instance = m_vClients.emplace_back(std::jthread([&client, &loopFunc]() { loopFunc(client); }), client); - instance.second->self = std::weak_ptr(instance.second); - return instance.second; +SP Clients::newClient(std::function &)> loopFunc) { + SP client = SP(new Client(m_wpServer.lock(), shared_from_this())); + auto &instance = m_vClients.emplace_back(std::jthread([&client, &loopFunc]() { loopFunc(client); }), client); + instance.second->m_self = std::weak_ptr(instance.second); + return client; } void Clients::broadcast(const std::string &msg, std::optional> self) { diff --git a/src/server/server.cpp b/src/server/server.cpp index c14a39e..aabbb50 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -1,6 +1,7 @@ #include "libsock/server/server.hpp" #include "libsock/types.hpp" #include "misc/FileDescriptor.hpp" +#include #include #include #include @@ -14,8 +15,6 @@ namespace Server { Server::Server(uint16_t port, bool reuseaddr, bool keepalive) : m_sockfd(std::make_shared(socket(AF_INET, SOCK_STREAM, 0))) , m_port(port) { - if (pServer) - throw std::runtime_error("server:server Server already exist"); std::lock_guard lk(m_mutex); if (!m_sockfd->isValid() || m_sockfd->get() < 0) throw std::runtime_error("server:server Failed to create socket"); @@ -37,20 +36,22 @@ Server::Server(uint16_t port, bool reuseaddr, bool keepalive) } SP Server::create(uint16_t port, bool reuseaddr, bool keepalive) { - if (pServer) - throw std::runtime_error("server:server Server already exist"); - pServer = SP(new Server(port, reuseaddr, keepalive)); - return pServer; + auto c = SP(new Server(port, reuseaddr, keepalive)); + vpServer.emplace_back(c); + c->m_self = c; + return c; } -SP Server::get() { - if (!pServer) - pServer = shared_from_this(); - return pServer; +WP Server::get() { + std::lock_guard lk(m_mutex); + if (m_self.expired()) + m_self = shared_from_this(); + return m_self; } Server::~Server() { m_sockfd.reset(); + vpServer.erase(std::remove_if(vpServer.begin(), vpServer.end(), [this](const SP &sptr) { return sptr.get() == this; }), vpServer.end()); } SP Server::getSocket() const { -- cgit v1.2.3