fix: serial port crash when close and reopen

Author: ruanshudong

mock/FrameworkServer.cpp

@@ -70,7 +70,7 @@ bool FrameworkServer::loadLogFormat(const string& command, const string& params,
 
             sort(vHourlist.begin(),vHourlist.end());
 
-            unique(vHourlist.begin(),vHourlist.end());
+            vHourlist.erase(unique(vHourlist.begin(),vHourlist.end()),vHourlist.end());
 
             result = "loadLogFormat succ:" + sHour;
 

servant/libservant/StatReport.cpp

@@ -170,9 +170,9 @@ void  StatReport::resetStatInterv()
     _timePoint.push_back(2000);
     _timePoint.push_back(3000);
 
-    sort(_timePoint.begin(),_timePoint.end());
+    // sort(_timePoint.begin(),_timePoint.end());
 
-    unique(_timePoint.begin(),_timePoint.end());
+    // unique(_timePoint.begin(),_timePoint.end());
 }
 
 string StatReport::trimAndLimitStr(const string& str, uint32_t limitlen)

util/include/util/tc_serialport.h

@@ -144,7 +144,7 @@ class UTIL_DLL_API TC_SerialPort
         virtual void onClose() = 0;
 
 		/**
-		 * @brief 心跳回调, 在串口通信线程中调用, 每当有收发数据时, 都会回调, 最长不超过
+		 * @brief 心跳回调, 在串口通信线程中调用, 每当有收发数据时, 都会回调, 最长不超过_heartbeatMaxInterval时间没有收发数据, 会回调onHeartbeat
 		 */
 		virtual void onHeartbeat() {};
     };
@@ -389,7 +389,7 @@ class UTIL_DLL_API TC_SerialPort
 	/**
 	 * 互斥量
 	 */
-	std::mutex _mutex;
+	std::recursive_mutex _mutex;
 
 	/**
 	 * 等待互斥量

util/src/tc_serialport.cpp

@@ -74,7 +74,7 @@ void TC_SerialPortGroup::erase(const shared_ptr<TC_SerialPort> & sp)
 {
 	if(sp)
 	{
-		// sp->close();
+		sp->close();
 
 		std::lock_guard<std::recursive_mutex> lock(_mutex);
 		_serialPorts.erase(sp->options().portName);
@@ -273,6 +273,8 @@ TC_SerialPort::~TC_SerialPort()
 
 void TC_SerialPort::close()
 {
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
+
 	if(!isValid())
 	{
 		return;
@@ -304,6 +306,7 @@ void TC_SerialPort::close()
 
 	if(_serialFd != INVALID_HANDLE_VALUE)
 	{
+		CreateIoCompletionPort(_serialFd, NULL, 0, 0);
 
 		CloseHandle(_serialFd); 
 		_serialFd = INVALID_HANDLE_VALUE;
@@ -509,19 +512,19 @@ void TC_SerialPort::initialize()
 
 void TC_SerialPort::setParserCallback(const onparser_callback & onparser)
 {
-	std::lock_guard<std::mutex> lock(_mutex);
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
 	_onParserCallback = onparser;
 }
 
 void TC_SerialPort::setRequestCallback(const RequestCallbackPtr & callbackPtr)
 {
-	std::lock_guard<std::mutex> lock(_mutex);
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
 	_callbackPtr = callbackPtr;
 }
 
 TC_SerialPort::RequestCallbackPtr TC_SerialPort::getRequestCallbackPtr()
 {
-	std::lock_guard<std::mutex> lock(_mutex);
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
 	return _callbackPtr;
 }
 
@@ -534,9 +537,13 @@ void TC_SerialPort::sendRequest(const char* sBuffer, size_t length, bool header)
 
 	buff->addBuffer(sBuffer, length);
 
-	if(!isValid())
 	{
-		initialize();
+		std::lock_guard<std::recursive_mutex> lock(_mutex);
+
+		if(!isValid())
+		{
+			initialize();
+		}
 	}
 	addSendReqBuffer(buff, header);
 }
@@ -546,9 +553,13 @@ void TC_SerialPort::sendRequest(const shared_ptr<TC_NetWorkBuffer::Buffer> & buf
 	if (buff && buff->empty())
 		return;
 
-	if(!isValid())
 	{
-		initialize();
+		std::lock_guard<std::recursive_mutex> lock(_mutex);
+
+		if(!isValid())
+		{
+			initialize();
+		}
 	}
 	addSendReqBuffer(buff, header);
 }
@@ -595,7 +606,7 @@ void TC_SerialPort::notify(vector<char> && response)
 
 void TC_SerialPort::addSendReqBuffer(const shared_ptr<TC_NetWorkBuffer::Buffer> & reqBuffer, bool header)
 {
-	std::lock_guard<std::mutex> lock(_mutex);
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
 
 	if (header)
 	{
@@ -612,7 +623,6 @@ void TC_SerialPort::addSendReqBuffer(const shared_ptr<TC_NetWorkBuffer::Buffer>
 #else
 	_serialPortGroup->getEpoller().notify();
 #endif
-
 }
 
 int TC_SerialPort::doProtocolAnalysis(TC_NetWorkBuffer *buff)
@@ -630,10 +640,7 @@ int TC_SerialPort::doProtocolAnalysis(TC_NetWorkBuffer *buff)
 			vector<char> out;
 			ioriginal = buff->getBufferLength();
 
-			{
-				std::lock_guard<std::mutex> lock(_mutex);
-				ret = _onParserCallback(*buff, out);
-			}
+			ret = _onParserCallback(*buff, out);
 			isurplus = buff->getBufferLength();
 
 			if (ret == TC_NetWorkBuffer::PACKET_FULL || ret == TC_NetWorkBuffer::PACKET_FULL_CLOSE)
@@ -691,6 +698,11 @@ bool TC_SerialPort::handleCloseImp()
 
 bool TC_SerialPort::handleInputImp(const shared_ptr<TC_Epoller::EpollInfo> & epollInfo)
 {
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
+	if(!isValid())
+	{
+		return false;
+	}	
 	try
 	{
 		//串口读取数据
@@ -748,6 +760,11 @@ bool TC_SerialPort::handleInputImp()
 {
 	try
 	{
+		std::lock_guard<std::recursive_mutex> lock(_mutex);
+		if(!isValid())
+		{
+			return false;
+		}
 		this->recv();
 	}
 	catch (exception & ex)
@@ -769,9 +786,9 @@ void TC_SerialPort::onRequestCallback()
 	for (;;)
 	{
 		decltype(_messages)::iterator it;
+		std::lock_guard<std::recursive_mutex> lock(_mutex);
 
 		{
-			std::lock_guard<std::mutex> lock(_mutex);
 			if (_messages.empty())
 			{
 				return;
@@ -788,8 +805,6 @@ void TC_SerialPort::onRequestCallback()
 
 		if (iRet != eRetNotSend)
 		{
-			std::lock_guard<std::mutex> lock(_mutex);
-
 			_messages.erase(it);
 		}
 
@@ -828,13 +843,25 @@ bool TC_SerialPort::handleOutputImp()
 #if TARGET_PLATFORM_WINDOWS
 void TC_SerialPort::sendSucc(uint32_t len)
 {
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
+	if(!isValid())
+	{
+		return;
+	}
+
 	_sendBuffer.moveHeader(len);
 }
 
 void TC_SerialPort::recvSucc(uint32_t len)
 {
 	try
 	{
+		std::lock_guard<std::recursive_mutex> lock(_mutex);
+		if(!isValid())
+		{
+			return;
+		}
+
 		assert(!_buffRecv.empty());
 
 		auto it = _buffRecv.begin();
@@ -860,7 +887,6 @@ void TC_SerialPort::recvSucc(uint32_t len)
 		if (callback)
 		{
 			callback->onFailed(ex.what());
-			// callback->onClose();
 		}
 	}	
 
@@ -919,6 +945,7 @@ TC_SerialPort::ReturnStatus TC_SerialPort::writeBuffer(const shared_ptr<TC_NetWo
 
 void TC_SerialPort::doRequest()
 {
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
 	//buf不为空,先发送buffer的内容
 	while (!_sendBuffer.empty())
 	{
@@ -944,11 +971,7 @@ void TC_SerialPort::doRequest()
 int TC_SerialPort::send(const void *buf, uint32_t len)
 {
 #if TARGET_PLATFORM_WINDOWS
-	if(!isValid())
-	{
-		return 0;
-	}
-
+	
 	if(len == 0)
 	{
 		return 0;
@@ -1005,10 +1028,7 @@ int TC_SerialPort::send(const void *buf, uint32_t len)
 
 int TC_SerialPort::recv()
 {
-	if(!isValid())
-	{
-		return 0;
-	}
+
 	DWORD  dwErrorFlags;
 	COMSTAT ComStat;
 	DWORD dwBytesRead;