🚀 Added proper server stopping

Lygaen · Feb 9, 2024 · 0602df3 · 0602df3
1 parent 01f4e1e
commit 0602df3
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 8 deletions.
diff --git a/src/cmd/console.cpp b/src/cmd/console.cpp
@@ -8,12 +8,14 @@
 #if defined(__linux__)
 #include <termios.h>
 #include <unistd.h>
+#include <pthread.h>
 #elif defined(_WIN32)
 #include <conio.h>
+#include <windows.h>
 #endif
 
 ConsoleManager *ConsoleManager::instance;
-ConsoleManager::ConsoleManager() : currentInput("")
+ConsoleManager::ConsoleManager() : currentInput(""), isRunning(false)
 {
     if (instance)
         throw std::runtime_error("Console handler should not be constructed twice");
@@ -95,13 +97,35 @@ void ConsoleManager::loop()
     }
 }
 
+#include <server.h>
+
 void ConsoleManager::start()
 {
-    std::thread([this]()
-                { while(true) {
-                                    this->loop();
-                                    } })
-        .detach();
+    std::thread t = std::thread([this]()
+                                { 
+                    this->isRunning = true;
+                    while (isRunning)
+                    {
+                        this->loop();
+                    } });
+    threadHandle = t.native_handle();
+    t.detach();
+
+    CommandsManager::inst().addCommand(
+        "stop", [](const ISender::SenderType, ISender &, const std::vector<std::string> &)
+        { Server::inst()->stop(); },
+        "", "Stops the server");
+}
+
+void ConsoleManager::stop()
+{
+    isRunning = false;
+
+#if defined(__linux__)
+    pthread_cancel(threadHandle);
+#elif defined(_WIN32)
+    TerminateThread(threadHandle, 1);
+#endif
 }
 
 void ConsoleManager::onPostPrint(logger::PostPrintEvent event)

diff --git a/src/cmd/console.h b/src/cmd/console.h
@@ -13,6 +13,7 @@
 #define MINESERVER_CONSOLE_H
 
 #include <thread>
+#include <atomic>
 #include <utils/logger.h>
 
 /**
@@ -26,6 +27,8 @@ class ConsoleManager
 
     std::string currentInput;
     EventHandler<logger::PostPrintEvent>::subId subscribeId;
+    std::thread::native_handle_type threadHandle;
+    std::atomic<bool> isRunning;
 
     void loop();
 
@@ -46,6 +49,11 @@ class ConsoleManager
      *
      */
     void start();
+    /**
+     * @brief Stops listening for commands
+     *
+     */
+    void stop();
     /**
      * @brief Post print hook
      *

diff --git a/src/server.cpp b/src/server.cpp
@@ -14,14 +14,16 @@
 #include <utils/logger.h>
 #include <plugins/event.h>
 #include <plugins/events/serverevents.hpp>
+#include <chrono>
 
 Server *Server::INSTANCE;
 Server::Server() : sock(),
                    connectedClients(),
                    pluginsManager(),
                    eventsManager(),
                    commandsManager(),
-                   consoleManager()
+                   consoleManager(),
+                   isRunning(false)
 {
     if (INSTANCE)
         return;
@@ -87,11 +89,13 @@ void Server::start()
     logger::info("Server started on %s:%d !", addr.c_str(), port);
     while (isRunning)
     {
+        std::this_thread::sleep_for(std::chrono::milliseconds(100)); // So that we don't overload the CPU
         ClientSocket cs = sock.accept();
 
         if (!cs.isValid())
             continue;
 
+        // Join thread afterwards
         std::thread([&cs, this]()
                     {
             Client client(cs);
@@ -113,4 +117,7 @@ void Server::stop()
     }
 
     sock.close();
+
+    consoleManager.stop();
+    logger::debug("Stopped server !");
 }
diff --git a/src/server.h b/src/server.h
@@ -19,6 +19,7 @@
 #include <cmd/commands.h>
 #include <cmd/console.h>
 #include <client.h>
+#include <atomic>
 #include <list>
 
 /**
@@ -38,7 +39,7 @@ class Server
     CommandsManager commandsManager;
     ConsoleManager consoleManager;
     ServerSocket sock;
-    bool isRunning{};
+    std::atomic<bool> isRunning;
 
     /**
      * @brief Internal Checks

diff --git a/src/utils/network.cpp b/src/utils/network.cpp
@@ -20,6 +20,7 @@
 #include <WinSock2.h>
 #endif // _WIN32
 #if defined(__linux__)
+#include <fcntl.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -56,6 +57,12 @@ bool ServerSocket::bind(const char *address, int port)
         serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
     }
     serv_addr.sin_port = htons(port);
+#if defined(__linux__)
+    fcntl(sock, F_SETFL, O_NONBLOCK);
+#elif defined(_WIN32)
+    u_long mode = 1; // 1 to enable non-blocking socket
+    ioctlsocket(sock, FIONBIO, &mode);
+#endif
     int status_code = ::bind(sock, (struct sockaddr *)&serv_addr, sizeof(serv_addr));
     return status_code >= 0;
 }