分离IO线程和逻辑线程，实现后端防抖。诊断性能提高到10万行

Author: CppCXY

CodeFormatServer/src/CodeFormatServer.cpp

@@ -16,25 +16,20 @@ using namespace asio::ip;
 
 int main(int argc, char** argv)
 {
-    if(argc > 1)
-    {
-        int port = std::stoi(argv[1]);
-        asio::io_context ioc(1);
+	auto ioc = std::make_shared<asio::io_context>(1);
+	if (argc > 1)
+	{
+		int port = std::stoi(argv[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();
-            LanguageClient::GetInstance().SetSession(std::make_shared<SocketIOSession>(std::move(socket)));
-            LanguageClient::GetInstance().Run();
-        }
-    }
-    else
-    {
-        SET_BINARY_MODE();
-        LanguageClient::GetInstance().SetSession(std::make_shared<StandardIOSession>());
-        LanguageClient::GetInstance().Run();
-    }
+		auto socket = acceptor.accept();
+		LanguageClient::GetInstance().SetSession(std::make_shared<SocketIOSession>(std::move(socket)));
+	}
+	else
+	{
+		SET_BINARY_MODE();
+		LanguageClient::GetInstance().SetSession(std::make_shared<StandardIOSession>());
+	}
 
-    return 0;
-}
+	return LanguageClient::GetInstance().Run(ioc);
+}

CodeFormatServer/src/LanguageClient.cpp

@@ -6,7 +6,7 @@
 #include "Util/format.h"
 #include "Util/Url.h"
 #include "Util/FileFinder.h"
-
+#include "asio.hpp"
 #include "CodeFormatServer/Service/ModuleService.h"
 #include "CodeFormatServer/Service/CodeFormatService.h"
 #include "CodeFormatServer/Service/CompletionService.h"
@@ -20,7 +20,8 @@ LanguageClient& LanguageClient::GetInstance()
 
 LanguageClient::LanguageClient()
 	: _defaultOptions(std::make_shared<LuaCodeStyleOptions>()),
-	  _idCounter(0)
+	  _idCounter(0),
+	  _ioc(nullptr)
 {
 }
 
@@ -30,12 +31,12 @@ void LanguageClient::InitializeService()
 	AddService<ModuleService>();
 	AddService<CompletionService>();
 
-	for(auto service : _services)
+	for (auto service : _services)
 	{
 		service->Initialize();
 	}
 
-	for(auto service : _services)
+	for (auto service : _services)
 	{
 		service->Start();
 	}
@@ -90,13 +91,13 @@ void LanguageClient::UpdateFile(std::string_view uri, vscode::Range range, std::
 {
 	auto filename = url::UrlToFilePath(uri);
 	auto it = _fileMap.find(filename);
-	if(it == _fileMap.end())
+	if (it == _fileMap.end())
 	{
 		auto virtualFile = std::make_shared<VirtualFile>(filename);
 		virtualFile->UpdateFile(std::move(text));
 		_fileMap[filename] = virtualFile;
 	}
-	else if(range.start.line == -1)
+	else if (range.start.line == -1)
 	{
 		it->second->UpdateFile(std::move(text));
 	}
@@ -116,13 +117,13 @@ void LanguageClient::UpdateFile(std::string_view uri, std::vector<vscode::TextDo
 	}
 }
 
-void LanguageClient::ParseFile(std::string_view uri)
+void LanguageClient::ClearFile(std::string_view uri)
 {
 	auto filename = url::UrlToFilePath(uri);
 	auto it = _fileMap.find(filename);
 	if (it != _fileMap.end())
 	{
-		it->second->MakeParser();
+		_fileMap.erase(it);
 	}
 }
 
@@ -161,6 +162,35 @@ void LanguageClient::DiagnosticFile(std::string_view uri)
 	SendNotification("textDocument/publishDiagnostics", vscodeDiagnosis);
 }
 
+void LanguageClient::DelayDiagnosticFile(std::string_view uri)
+{
+	auto stringUri = std::string(uri);
+	auto task = std::make_shared<asio::steady_timer>(GetIOContext(), std::chrono::milliseconds(500));
+	auto it = _fileDiagnosticTask.find(uri);
+	if (it != _fileDiagnosticTask.end())
+	{
+		it->second->cancel();
+		it->second = task;
+	}
+	else {
+		_fileDiagnosticTask.insert({ stringUri, task });
+	}
+
+	task->async_wait([this, stringUri](const asio::error_code& code)
+	{
+		if (code == asio::error::operation_aborted)
+		{
+			return;
+		}
+		DiagnosticFile(stringUri);
+		auto it = _fileDiagnosticTask.find(stringUri);
+		if (it != _fileDiagnosticTask.end())
+		{
+			_fileDiagnosticTask.erase(it);
+		}
+	});
+}
+
 std::shared_ptr<LuaParser> LanguageClient::GetFileParser(std::string_view uri)
 {
 	auto filename = url::UrlToFilePath(uri);
@@ -173,12 +203,14 @@ std::shared_ptr<LuaParser> LanguageClient::GetFileParser(std::string_view uri)
 	return nullptr;
 }
 
-void LanguageClient::Run()
+int LanguageClient::Run(std::shared_ptr<asio::io_context> ioc)
 {
+	_ioc = ioc;
 	if (_session)
 	{
-		_session->Run();
+		return _session->Run(*ioc);
 	}
+	return 1;
 }
 
 std::shared_ptr<LuaCodeStyleOptions> LanguageClient::GetOptions(std::string_view uriOrFilename)
@@ -273,6 +305,11 @@ void LanguageClient::SetRoot(std::string_view root)
 	_root = root;
 }
 
+asio::io_context& LanguageClient::GetIOContext()
+{
+	return *_ioc;
+}
+
 uint64_t LanguageClient::GetRequestId()
 {
 	return ++_idCounter;

CodeFormatServer/src/LanguageService.cpp

@@ -3,6 +3,7 @@
 #include <iostream>
 #include <sstream>
 #include "nlohmann/json.hpp"
+#include "asio.hpp"
 #include "CodeFormatServer/VSCode.h"
 #include "CodeService/LuaCodeStyleOptions.h"
 #include "CodeService/LuaFormatter.h"
@@ -155,16 +156,14 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnDidChange(
 		LanguageClient::GetInstance().UpdateFile(param->textDocument.uri, param->contentChanges);
 	}
 
-	LanguageClient::GetInstance().ParseFile(param->textDocument.uri);
-	LanguageClient::GetInstance().DiagnosticFile(param->textDocument.uri);
+	LanguageClient::GetInstance().DelayDiagnosticFile(param->textDocument.uri);
 	return nullptr;
 }
 
 std::shared_ptr<vscode::Serializable> LanguageService::OnDidOpen(
 	std::shared_ptr<vscode::DidOpenTextDocumentParams> param)
 {
 	LanguageClient::GetInstance().UpdateFile(param->textDocument.uri, {}, std::move(param->textDocument.text));
-	LanguageClient::GetInstance().ParseFile(param->textDocument.uri);
 	LanguageClient::GetInstance().DiagnosticFile(param->textDocument.uri);
 	return nullptr;
 }
@@ -206,7 +205,7 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnFormatting(
 std::shared_ptr<vscode::Serializable> LanguageService::OnClose(
 	std::shared_ptr<vscode::DidCloseTextDocumentParams> param)
 {
-	LanguageClient::GetInstance().ParseFile(param->textDocument.uri);
+	LanguageClient::GetInstance().ClearFile(param->textDocument.uri);
 
 	return nullptr;
 }

CodeFormatServer/src/Session/IOSession.cpp

@@ -3,6 +3,7 @@
 #include <nlohmann/json.hpp>
 #include "CodeFormatServer/Protocol/ProtocolParser.h"
 #include <chrono>
+#include <thread>
 #include "Util/format.h"
 
 namespace chrono = std::chrono;
@@ -17,31 +18,39 @@ IOSession::~IOSession()
 {
 }
 
-void IOSession::Run()
+int IOSession::Run(asio::io_context& ioc)
 {
+	std::thread t([&ioc]()
+	{
+		while(true)
+		{
+			ioc.run();
+			std::this_thread::yield();
+		}
+	});
+	t.detach();
+	return 0;
 }
 
-std::string IOSession::Handle(std::string_view msg)
+std::string IOSession::Handle(std::shared_ptr<ProtocolParser> parser)
 {
 	try
 	{
-		ProtocolParser parser;
-
-		parser.Parse(msg);
 
-		auto params = parser.GetParams();
+		auto params = parser->GetParams();
 
 		if (!params.is_null())
 		{
 			auto start = chrono::system_clock::now();
-			auto result = _service.Dispatch(parser.GetMethod(), params);
+			auto result = _service.Dispatch(parser->GetMethod(), params);
 			if (result)
 			{
-				return parser.SerializeProtocol(result);
+				return parser->SerializeProtocol(result);
 			}
-			std::cerr << format("request {}, it cost: {}ms\n", parser.GetMethod(), chrono::duration_cast<chrono::milliseconds>(
-				chrono::system_clock::now() - start
-				).count());
+			std::cerr << format("request {}, it cost: {}ms\n", parser->GetMethod(),
+			                    chrono::duration_cast<chrono::milliseconds>(
+				                    chrono::system_clock::now() - start
+			                    ).count());
 		}
 	}
 	catch (std::exception& e)

CodeFormatServer/src/Session/SocketIOSession.cpp

@@ -9,8 +9,9 @@ SocketIOSession::SocketIOSession(asio::ip::tcp::socket&& socket)
 {
 }
 
-void SocketIOSession::Run()
+int SocketIOSession::Run(asio::io_context& ioc)
 {
+	IOSession::Run(ioc);
 	while (true)
 	{
 		do
@@ -37,18 +38,26 @@ void SocketIOSession::Run()
 		}
 		while (true);
 
-		do {
+		do
+		{
 			auto content = _protocolBuffer.ReadOneProtocol();
-			std::string result = Handle(content);
-
+			auto parser = std::make_shared<ProtocolParser>();
+			parser->Parse(content);
 			_protocolBuffer.Reset();
-			if (!result.empty()) {
-				Send(result);
-			}
-		} while (_protocolBuffer.CanReadOneProtocol());
+			asio::post(ioc, [this, parser]()
+			{
+				std::string result = Handle(parser);
+
+				if (!result.empty())
+				{
+					Send(result);
+				}
+			});
+		}
+		while (_protocolBuffer.CanReadOneProtocol());
 	}
 endLoop:
-	return;
+	return 0;
 }
 
 void SocketIOSession::Send(std::string_view content)

CodeFormatServer/src/Session/StandardIOSession.cpp

@@ -1,15 +1,13 @@
 #include "CodeFormatServer/Session/StandardIOSession.h"
 
 #include <iostream>
-
-#ifndef _WIN32
 #include <asio.hpp>
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 #include "CodeFormatServer/Protocol/ProtocolParser.h"
 #include "CodeFormatServer/Protocol/ProtocolBuffer.h"
 
-
 class StandardIO
 {
 public:
@@ -81,13 +79,11 @@ void StandardIO::Write(std::string_view content)
 	std::cout.write(content.data(), content.size());
 }
 
-
 #endif
 
 
-void StandardIOSession::Run()
+int StandardIOSession::Run(asio::io_context& ioc)
 {
-
 	while (true)
 	{
 		do
@@ -115,18 +111,24 @@ void StandardIOSession::Run()
 
 		do
 		{
-			std::string result = Handle(_protocolBuffer.ReadOneProtocol());
-
+			auto content = _protocolBuffer.ReadOneProtocol();
+			auto parser = std::make_shared<ProtocolParser>();
+			parser->Parse(content);
 			_protocolBuffer.Reset();
-			if (!result.empty())
-			{
-				Send(result);
-			}
+			asio::post(ioc, [this, parser]()
+				{
+					std::string result = Handle(parser);
+
+					if (!result.empty())
+					{
+						Send(result);
+					}
+				});
 		}
 		while (_protocolBuffer.CanReadOneProtocol());
 	}
 endLoop:
-	return;
+	return 0;
 }
 
 void StandardIOSession::Send(std::string_view content)