Пересмотр асинхронностей

Src/Common/Net.hpp

@@ -3,28 +3,28 @@
 #include "MemoryPool.hpp"
 #include "Async.hpp"
 #include "TOSLib.hpp"
+#include "boost/asio/io_context.hpp"
 
-#include <atomic>
 #include <boost/asio.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/write.hpp>
 #include <boost/thread.hpp>
 #include <boost/circular_buffer.hpp>
-#include <condition_variable>
 
 namespace LV::Net {
 
-class SocketServer : public AsyncObject {
+class SocketServer {
 protected:
+    asio::io_context &IOC;
     tcp::acceptor Acceptor;
 
 public:
     SocketServer(asio::io_context &ioc, std::function<coro<>(tcp::socket)> &&onConnect, uint16_t port = 0)
-        : AsyncObject(ioc), Acceptor(ioc, tcp::endpoint(tcp::v4(), port))
+        : IOC(ioc), Acceptor(ioc, tcp::endpoint(tcp::v4(), port))
     {
         assert(onConnect);
 
-        co_spawn(run(std::move(onConnect)));
+        asio::co_spawn(IOC, run(std::move(onConnect)), asio::detached);
     }
 
     bool isStopped();
@@ -178,7 +178,8 @@ protected:
         std::function<std::optional<SmartPacket>()> OnSend;
     };
 
-    class AsyncSocket : public AsyncObject {
+    class AsyncSocket {
+        asio::io_context &IOC;
         NetPool::Array<32> RecvBuffer, SendBuffer;
         size_t RecvPos = 0, RecvSize = 0, SendSize = 0;
         bool ReadShutdowned = false;
@@ -196,22 +197,21 @@ protected:
 
         struct SendPacketsObj {
             boost::mutex Mtx;
-            bool WaitForSemaphore = false;
-            asio::deadline_timer Semaphore, SenderGuard;
+            asio::deadline_timer Semaphore;
             boost::circular_buffer_space_optimized<Packet> SimpleBuffer;
             boost::circular_buffer_space_optimized<SmartPacket> SmartBuffer;
             size_t SizeInQueue = 0;
             std::shared_ptr<AsyncContext> Context;
 
             SendPacketsObj(asio::io_context &ioc)
-                : Semaphore(ioc, boost::posix_time::pos_infin), SenderGuard(ioc, boost::posix_time::pos_infin)
+                : Semaphore(ioc, boost::posix_time::pos_infin)
             {}
         } SendPackets;
 
     public:
         AsyncSocket(asio::io_context &ioc, tcp::socket &&socket)
-            : AsyncObject(ioc), Socket(std::move(socket)), SendPackets(ioc)
-        { 
+            : IOC(ioc), Socket(std::move(socket)), SendPackets(ioc)
+        {
             SendPackets.SimpleBuffer.set_capacity(512);
             SendPackets.SmartBuffer.set_capacity(SendPackets.SimpleBuffer.capacity()/4);
             SendPackets.Context = std::make_shared<AsyncContext>();
@@ -221,7 +221,7 @@ protected:
             boost::asio::ip::tcp::no_delay optionNoDelay(true); // Отключает попытки объёденить данные в крупные пакеты
             Socket.set_option(optionNoDelay);
 
-            co_spawn(runSender(SendPackets.Context));
+            asio::co_spawn(IOC, runSender(SendPackets.Context), asio::detached);
         }
 
         ~AsyncSocket();