修复linux/mac上无法正确运行语言服务得问题

Author: CppCXY

CodeFormatServer/CMakeLists.txt

@@ -10,7 +10,7 @@ target_include_directories(CodeFormatServer PUBLIC
 	${LuaCodeStyle_SOURCE_DIR}/include
 	${LuaCodeStyle_SOURCE_DIR}/3rd/asio-1.20.0/include
 	${LuaCodeStyle_SOURCE_DIR}/3rd/nlohmann_json/include
-	${LuaCodeStyle_SOURCE_DIR}/3rd/mimalloc-2.0.3/include
+	#${LuaCodeStyle_SOURCE_DIR}/3rd/mimalloc-2.0.3/include
 	src
 )
 
@@ -43,7 +43,7 @@ target_sources(CodeFormatServer
 	${CodeFormatServer_SOURCE_DIR}/src/VSCode.cpp
 
 	# mimalloc
-	${LuaCodeStyle_SOURCE_DIR}/3rd/mimalloc-2.0.3/src/static.c
+	#${LuaCodeStyle_SOURCE_DIR}/3rd/mimalloc-2.0.3/src/static.c
 )
 
 target_link_libraries(CodeFormatServer PUBLIC CodeService)

CodeFormatServer/src/CodeFormatServer.cpp

@@ -3,15 +3,17 @@
 #include "CodeFormatServer/LanguageClient.h"
 #include "CodeFormatServer/Session/SocketIOSession.h"
 #include "CodeFormatServer/Session/StandardIOSession.h"
-
+#include <thread>
 // https://stackoverflow.com/questions/1598985/c-read-binary-stdin
 #ifdef _WIN32
 # include <io.h>
 # include <fcntl.h>
 # define SET_BINARY_MODE() _setmode(_fileno(stdin), _O_BINARY);\
 	_setmode(_fileno(stdout), _O_BINARY)
 #else
-# define SET_BINARY_MODE() ((void)0)
+# include <sys/io.h>
+# include <fcntl.h>
+# define SET_BINARY_MODE() (void)0
 #endif
 
 using namespace asio::ip;
@@ -23,7 +25,8 @@ int main(int argc, char** argv)
     {
         int port = std::stoi(argv[1]);
         asio::io_context ioc(1);
-        tcp::acceptor acceptor(ioc, tcp::endpoint(tcp::v4(), port));
+
+    	tcp::acceptor acceptor(ioc, tcp::endpoint(tcp::v4(), port));
         while(true)
         {
             auto socket = acceptor.accept();

CodeFormatServer/src/Session/StandardIOSession.cpp

@@ -1,10 +1,90 @@
 #include "CodeFormatServer/Session/StandardIOSession.h"
 
 #include <iostream>
-#include <thread>
+
+#ifndef _WIN32
+#include <asio.hpp>
+#include <unistd.h>
+#endif
 #include "CodeFormatServer/Protocol/ProtocolParser.h"
 #include "CodeFormatServer/Protocol/ProtocolBuffer.h"
 
+
+class StandardIO
+{
+public:
+	static StandardIO& GetInstance();
+
+	StandardIO();
+
+	std::size_t ReadSome(char* buffer, std::size_t maxSize);
+
+	bool HasError();
+
+	void Write(std::string_view content);
+private:
+#ifndef _WIN32
+	asio::io_context _ioc;
+	asio::error_code _code;
+	std::shared_ptr<asio::posix::stream_descriptor> _in;
+	std::shared_ptr<asio::posix::stream_descriptor> _out;
+#endif
+};
+
+StandardIO& StandardIO::GetInstance()
+{
+	static StandardIO instance;
+	return instance;
+}
+
+#ifndef _WIN32
+StandardIO::StandardIO()
+	:_ioc(1)
+{
+	_in = std::make_shared<asio::posix::stream_descriptor>(_ioc, STDIN_FILENO);
+	_out = std::make_shared<asio::posix::stream_descriptor>(_ioc, STDOUT_FILENO);
+}
+
+std::size_t StandardIO::ReadSome(char* buffer, std::size_t maxSize)
+{
+	return _in->read_some(asio::buffer(buffer, maxSize), _code);
+}
+
+bool StandardIO::HasError()
+{
+	return _code == asio::error::eof || _code;
+}
+
+void StandardIO::Write(std::string_view content)
+{
+	_out->write_some(asio::buffer(content.data(),content.size()));
+}
+
+#else
+StandardIO::StandardIO()
+{
+}
+
+std::size_t StandardIO::ReadSome(char* buffer, std::size_t maxSize)
+{
+	std::cin.peek();
+	return std::cin.readsome(buffer, maxSize);
+}
+
+bool StandardIO::HasError()
+{
+	return !std::cin;
+}
+
+void StandardIO::Write(std::string_view content)
+{
+	std::cout.write(content.data(), content.size());
+}
+
+
+#endif
+
+
 void StandardIOSession::Run()
 {
 
@@ -15,9 +95,9 @@ void StandardIOSession::Run()
 			char* writableCursor = _protocolBuffer.GetWritableCursor();
 			std::size_t capacity = _protocolBuffer.GetRestCapacity();
 
-			std::cin.peek();
-			std::size_t readSize = std::cin.readsome(writableCursor, capacity);
-			if (!std::cin)
+			std::size_t readSize = StandardIO::GetInstance().ReadSome(writableCursor, capacity);
+
+			if(StandardIO::GetInstance().HasError())
 			{
 				goto endLoop;
 			}
@@ -30,23 +110,26 @@ void StandardIOSession::Run()
 			}
 
 			_protocolBuffer.FitCapacity();
+		}
+		while (true);
 
-		} while (true);
-
-		do {
+		do
+		{
 			std::string result = Handle(_protocolBuffer.ReadOneProtocol());
 
 			_protocolBuffer.Reset();
-			if (!result.empty()) {
+			if (!result.empty())
+			{
 				Send(result);
 			}
-		} while (_protocolBuffer.CanReadOneProtocol());
+		}
+		while (_protocolBuffer.CanReadOneProtocol());
 	}
 endLoop:
 	return;
 }
 
 void StandardIOSession::Send(std::string_view content)
 {
-	std::cout.write(content.data(), content.size());
+	StandardIO::GetInstance().Write(content);
 }

include/CodeFormatServer/Session/StandardIOSession.h

@@ -2,6 +2,7 @@
 
 #include "IOSession.h"
 
+
 class StandardIOSession: public IOSession
 {
 public: