在苹果上使用普通thread

Author: CppCXY

CodeFormatServer/src/Session/IOSession.cpp

@@ -18,12 +18,19 @@ IOSession::~IOSession()
 {
 	if(_logicThread)
 	{
+#ifndef __APPLE__
 		_logicThread->request_stop();
+#else
+		_running = false;
+		_logicThread->join();
+#endif
 	}
 }
 
 int IOSession::Run(asio::io_context& ioc)
 {
+	//Æ»¹ûÔÝδ֧³Ö Õâ¸öjthread
+#ifndef __APPLE__
 	_logicThread = std::make_shared<std::jthread>([&ioc](std::stop_token st)
 	{
 		while (!st.stop_requested())
@@ -33,6 +40,17 @@ int IOSession::Run(asio::io_context& ioc)
 			std::this_thread::sleep_for(std::chrono::milliseconds(1));
 		}
 	});
+#else
+	_logicThread = std::make_shared<std::thread>([&ioc, this]()
+		{
+			while (_running)
+			{
+				ioc.run();
+				ioc.reset();
+				std::this_thread::sleep_for(std::chrono::milliseconds(1));
+			}
+		});
+#endif
 
 	return 0;
 }

LuaParser/src/LuaIdentify.cpp

@@ -1,6 +1,4 @@
-#pragma once
-
-#include "LuaParser/LuaIdentify.h"
+#include "LuaParser/LuaIdentify.h"
 #include "LuaDefine.h"
 
 std::array<unsigned char, UCHAR_MAX + 2> LuaIdentify::LuaCharType = {

include/CodeFormatServer/Session/IOSession.h

@@ -19,5 +19,11 @@ class IOSession
 	ProtocolBuffer _protocolBuffer;
 private:
 	LanguageService _service;
+#ifndef __APPLE__
 	std::shared_ptr<std::jthread> _logicThread;
+#else
+	std::shared_ptr<std::thread> _logicThread = nullptr;
+	volatile bool _running = true;
+#endif
+
 };