修改缓冲区方案

Author: CppCXY

CodeFormatServer/src/CodeFormatServer.cpp

@@ -18,7 +18,7 @@ using namespace asio::ip;
 
 int main(int argc, char** argv)
 {
-    // std::this_thread::sleep_for(std::chrono::seconds(10));
+
     if(argc > 1)
     {
         int port = std::stoi(argv[1]);
@@ -33,6 +33,7 @@ int main(int argc, char** argv)
     }
     else
     {
+        // std::this_thread::sleep_for(std::chrono::seconds(10));
         SET_BINARY_MODE();
         LanguageClient::GetInstance().SetSession(std::make_shared<StandardIOSession>());
         LanguageClient::GetInstance().Run();

CodeFormatServer/src/LanguageClient.cpp

@@ -82,8 +82,6 @@ void LanguageClient::DiagnosticFile(std::string_view uri)
 		return;
 	}
 
-
-
 	parser->BuildAstWithComment();
 
 	LuaFormatter formatter(parser, *options);

CodeFormatServer/src/Protocol/ProtocolBuffer.cpp

@@ -3,60 +3,44 @@
 
 ProtocolBuffer::ProtocolBuffer(std::size_t capacity)
 	: _writeIndex(0),
-	  _startIndex(0),
+	  _readBuffer(capacity, 0),
 	  _contentLength(0),
 	  _bodyStartIndex(0)
 {
-	_buffer.resize(capacity);
 }
 
 char* ProtocolBuffer::GetWritableCursor()
 {
-	return _buffer.data() + _writeIndex;
+	return _readBuffer.data();
 }
 
 
 std::size_t ProtocolBuffer::GetRestCapacity()
 {
-	return _buffer.size() - _writeIndex;
+	return _readBuffer.size();
 }
 
-void ProtocolBuffer::SetReadableSize(std::size_t readableSize)
+void ProtocolBuffer::WriteBuff(std::size_t size)
 {
-	_writeIndex = _startIndex + readableSize;
+	if (_textProtocol.size() < _writeIndex + size)
+	{
+		_textProtocol.resize(_writeIndex + size);
+	}
+
+	std::copy_n(_readBuffer.begin(), size, _textProtocol.begin() + _writeIndex);
+	_writeIndex += size;
 }
 
 bool ProtocolBuffer::CanReadOneProtocol()
 {
-	if (_startIndex == _writeIndex)
+	if (_writeIndex == 0)
 	{
 		return false;
 	}
 
-
 	bool success = TryParseHead();
-	bool completeOneProtocol = false;
-
-	if (success)
-	{
-		completeOneProtocol = _contentLength + _bodyStartIndex <= _writeIndex;
-	}
-
-	// 如果头解析不完整或者协议接收不完整
-	// 试图扩容
-	if ((!success || !completeOneProtocol) && (_buffer.size() - _writeIndex <= 1))
-	{
-		if (_contentLength != 0 && _bodyStartIndex != 0)
-		{
-			_buffer.resize(_bodyStartIndex + _contentLength);
-		}
-		else
-		{
-			_buffer.resize(_buffer.size() * 2);
-		}
-	}
 
-	return completeOneProtocol;
+	return success && (_contentLength + _bodyStartIndex <= _writeIndex);
 }
 
 std::string_view ProtocolBuffer::ReadOneProtocol()
@@ -65,26 +49,29 @@ std::string_view ProtocolBuffer::ReadOneProtocol()
 	{
 		if (_writeIndex >= _contentLength + _bodyStartIndex)
 		{
-			return std::string_view(_buffer.data() + _bodyStartIndex, _contentLength);
+			return std::string_view(_textProtocol.data() + _bodyStartIndex, _contentLength);
 		}
 	}
 	return "";
 }
 
 void ProtocolBuffer::Reset()
 {
-	if(_writeIndex > _contentLength + _bodyStartIndex)
+	if (_writeIndex > _contentLength + _bodyStartIndex)
 	{
 		std::size_t doneIndex = _contentLength + _bodyStartIndex;
-		std::memmove(_buffer.data(), _buffer.data() + doneIndex, _writeIndex - doneIndex);
+		std::copy_n(_textProtocol.data() + doneIndex, _writeIndex - doneIndex, _textProtocol.data());
 
-		_startIndex = 0;
-		_writeIndex -= _contentLength + _bodyStartIndex;
+		_writeIndex -= doneIndex;
+		_textProtocol.resize(std::max(_writeIndex, _readBuffer.size()));
+		_textProtocol.shrink_to_fit();
 	}
 	else
 	{
-		_startIndex = 0;
 		_writeIndex = 0;
+		_textProtocol.clear();
+		_textProtocol.resize(_readBuffer.size());
+		_textProtocol.shrink_to_fit();
 	}
 
 	_contentLength = 0;
@@ -100,7 +87,7 @@ bool ProtocolBuffer::TryParseHead()
 		CRLF_CRLF
 	} state = ParseState::HeadStart;
 
-	std::string_view text(_buffer.data() + _startIndex, _writeIndex - _startIndex);
+	std::string_view text(_textProtocol.data(), _writeIndex);
 	for (std::size_t index = 0; index < text.size();)
 	{
 		switch (state)
@@ -153,5 +140,5 @@ bool ProtocolBuffer::TryParseHead()
 		}
 	}
 
-	return true;
+	return false;
 }

CodeFormatServer/src/Session/IOSession.cpp

@@ -4,6 +4,7 @@
 #include "CodeFormatServer/Protocol/ProtocolParser.h"
 
 IOSession::IOSession()
+	: _protocolBuffer(65535)
 {
 	_service.Initialize();
 }
@@ -12,21 +13,33 @@ IOSession::~IOSession()
 {
 }
 
+void IOSession::Run()
+{
+}
+
 std::string IOSession::Handle(std::string_view msg)
 {
-	ProtocolParser parser;
+	try
+	{
+		ProtocolParser parser;
 
-	parser.Parse(msg);
+		parser.Parse(msg);
 
-	auto param = parser.GetParam();
+		auto param = parser.GetParam();
 
-	if (param)
-	{
-		auto result = _service.Dispatch(parser.GetMethod(), param);
-		if (result) {
-			return parser.SerializeProtocol(result);
+		if (param)
+		{
+			auto result = _service.Dispatch(parser.GetMethod(), param);
+			if (result)
+			{
+				return parser.SerializeProtocol(result);
+			}
 		}
 	}
+	catch (std::exception& e)
+	{
+		std::cerr << e.what() << std::endl;
+	}
 
 	return "";
 }

CodeFormatServer/src/Session/SocketIOSession.cpp

@@ -1,7 +1,5 @@
 #include "CodeFormatServer/Session/SocketIOSession.h"
-
 #include <iostream>
-
 #include "CodeFormatServer/Protocol/ProtocolParser.h"
 #include "CodeFormatServer/Protocol/ProtocolBuffer.h"
 using namespace asio::ip;
@@ -13,43 +11,40 @@ SocketIOSession::SocketIOSession(asio::ip::tcp::socket&& socket)
 
 void SocketIOSession::Run()
 {
-	ProtocolBuffer protocolBuffer(1024);
 	while (true)
 	{
-		asio::error_code code;
-		std::size_t readSize = 0;
-
-
 		do
 		{
-			char* writableCursor = protocolBuffer.GetWritableCursor();
-			std::size_t capacity = protocolBuffer.GetRestCapacity();
+			asio::error_code code;
+
+			char* writableCursor = _protocolBuffer.GetWritableCursor();
+			std::size_t capacity = _protocolBuffer.GetRestCapacity();
 
-			readSize += _socket.read_some(asio::buffer(writableCursor, capacity), code);
+			std::size_t readSize = _socket.read_some(asio::buffer(writableCursor, capacity), code);
 			if (code == asio::error::eof || code)
 			{
 				goto endLoop;
 			}
 
-			protocolBuffer.SetReadableSize(readSize);
+			_protocolBuffer.WriteBuff(readSize);
 
-			if (protocolBuffer.CanReadOneProtocol())
+			if (_protocolBuffer.CanReadOneProtocol())
 			{
 				break;
 			}
 		}
 		while (true);
 
 		do {
-			auto content = protocolBuffer.ReadOneProtocol();
+			auto content = _protocolBuffer.ReadOneProtocol();
 			// std::cout << content << std::endl;
 			std::string result = Handle(content);
 
-			protocolBuffer.Reset();
+			_protocolBuffer.Reset();
 			if (!result.empty()) {
 				Send(result);
 			}
-		} while (protocolBuffer.CanReadOneProtocol());
+		} while (_protocolBuffer.CanReadOneProtocol());
 	}
 endLoop:
 	return;

CodeFormatServer/src/Session/StandardIOSession.cpp

@@ -7,14 +7,14 @@
 
 void StandardIOSession::Run()
 {
-	ProtocolBuffer protocolBuffer(1024);
+
 	while (true)
 	{
 		std::size_t readSize = 0;
 		do
 		{
-			char* writableCursor = protocolBuffer.GetWritableCursor();
-			std::size_t capacity = protocolBuffer.GetRestCapacity();
+			char* writableCursor = _protocolBuffer.GetWritableCursor();
+			std::size_t capacity = _protocolBuffer.GetRestCapacity();
 
 			std::cin.peek();
 			readSize += std::cin.readsome(writableCursor, capacity);
@@ -23,23 +23,23 @@ void StandardIOSession::Run()
 				goto endLoop;
 			}
 
-			protocolBuffer.SetReadableSize(readSize);
+			_protocolBuffer.WriteBuff(readSize);
 
-			if (protocolBuffer.CanReadOneProtocol())
+			if (_protocolBuffer.CanReadOneProtocol())
 			{
 				break;
 			}
 
 		} while (true);
 
 		do {
-			std::string result = Handle(protocolBuffer.ReadOneProtocol());
+			std::string result = Handle(_protocolBuffer.ReadOneProtocol());
 
-			protocolBuffer.Reset();
+			_protocolBuffer.Reset();
 			if (!result.empty()) {
 				Send(result);
 			}
-		} while (protocolBuffer.CanReadOneProtocol());
+		} while (_protocolBuffer.CanReadOneProtocol());
 	}
 endLoop:
 	return;

include/CodeFormatServer/Protocol/ProtocolBuffer.h

@@ -11,7 +11,7 @@ class ProtocolBuffer
 
 	std::size_t GetRestCapacity();
 
-	void SetReadableSize(std::size_t readableSize);
+	void WriteBuff(std::size_t size);
 
 	bool CanReadOneProtocol();
 
@@ -22,12 +22,13 @@ class ProtocolBuffer
 	bool TryParseHead();
 	// 代表从这个位置开始可写
 	std::size_t _writeIndex;
-	// 代表从这个位置开始可读
-	// 同时如果writeIndex 和 startIndex 相同则认为可读长度为0
-	std::size_t _startIndex;
-	std::string _buffer;
+	std::string _textProtocol;
+
+	std::string _readBuffer;
 
 	std::size_t _contentLength;
 	std::size_t _bodyStartIndex;
+
+
 };
 

include/CodeFormatServer/Session/IOSession.h

@@ -1,17 +1,19 @@
 #pragma once
 #include <string>
 #include "CodeFormatServer/LanguageService.h"
+#include "CodeFormatServer/Protocol/ProtocolBuffer.h"
 
 class IOSession
 {
 public:
 	IOSession();
 	virtual ~IOSession();
 
-	virtual void Run() = 0;
+	virtual void Run();
 	virtual void Send(std::string_view content) = 0;
 protected:
 	std::string Handle(std::string_view msg);
+	ProtocolBuffer _protocolBuffer;
 private:
 	LanguageService _service;
 };