update

PHZ76 · Sep 2, 2019 · 67575ac · 67575ac
1 parent b8eb38f
commit 67575ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/net/BufferReader.h b/src/net/BufferReader.h
@@ -52,6 +52,13 @@ class BufferReader
         return crlf == beginWrite() ? nullptr : crlf;
     }
 
+	const char* findLastCrlfCrlf() const
+	{
+		char crlfCrlf[] = "\r\n\r\n";
+		const char* crlf = std::find_end(peek(), beginWrite(), crlfCrlf, crlfCrlf + 4);
+		return crlf == beginWrite() ? nullptr : crlf;
+	}
+
     void retrieveAll() 
     { 
         _writerIndex = 0; 

diff --git a/src/net/TcpConnection.cpp b/src/net/TcpConnection.cpp
@@ -99,10 +99,7 @@ void TcpConnection::handleWrite()
 	if (_isClosed)
 		return;
 
-	if (!_mutex.try_lock())
-	{
-		return;
-	}	
+	std::lock_guard<std::mutex> lock(_mutex);
 
     int ret = 0;
     bool empty = false;
@@ -112,7 +109,6 @@ void TcpConnection::handleWrite()
         if (ret < 0)
         {
 			this->close();
-			_mutex.unlock();
             return;
         }
         empty = _writeBufferPtr->isEmpty();
@@ -131,8 +127,6 @@ void TcpConnection::handleWrite()
         _channelPtr->enableWriting();
         _taskScheduler->updateChannel(_channelPtr);
     }
-
-	_mutex.unlock();
 }
 
 void TcpConnection::close()