Clear queues on exit to ensure all user context references are gone, …

…ref #628
ryzom · Mar 4, 2023 · ca416fd · ca416fd
1 parent 341fb82
commit ca416fd
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 4 deletions.
diff --git a/ryzom/server/src/frontend_service/fe_receive_sub.cpp b/ryzom/server/src/frontend_service/fe_receive_sub.cpp
@@ -177,9 +177,17 @@ void CFeReceiveSub::release()
 
 	nlassert( _ReceiveTask != NULL );
 	nlassert( _ReceiveThread != NULL );
-
-	delete m_QuicTransceiver;
-	m_QuicTransceiver = nullptr;
+
+	if (m_QuicTransceiver)
+	{
+		m_QuicTransceiver->stop();
+
+		m_QuicTransceiver->clearQueue(&m_Queues[2]);
+		m_QuicTransceiver->clearQueue(&m_Queues[3]);
+
+		delete m_QuicTransceiver;
+		m_QuicTransceiver = nullptr;
+	}
 
 	_ReceiveTask->requireExit();
 #ifdef NL_OS_UNIX

diff --git a/ryzom/server/src/frontend_service/quic_transceiver.cpp b/ryzom/server/src/frontend_service/quic_transceiver.cpp
@@ -403,6 +403,11 @@ void CQuicTransceiver::stop()
 		m->Listener = null;
 		nldebug("Listener closed");
 	}
+
+	// Clear queue
+	nldebug("Clear current write queue");
+	clearQueue(m->Buffer);
+	nldebug("Cleared");
 }
 
 void CQuicTransceiver::release()
@@ -645,12 +650,33 @@ void CQuicTransceiver::shutdownReceived(CQuicUserContext *user)
 
 NLMISC::CBufFIFO *CQuicTransceiver::swapWriteQueue(NLMISC::CBufFIFO *writeQueue)
 {
-	CAtomicFlagLockYield lock(m->BufferMutex);
+	CAtomicFlagLock lock(m->BufferMutex);
 	CBufFIFO *previous = m->Buffer;
 	m->Buffer = writeQueue;
 	return previous;
 }
 
+void CQuicTransceiver::clearQueue(NLMISC::CBufFIFO *queue)
+{
+	CAtomicFlagLockYield lock(m->BufferMutex);
+	while (!queue->empty())
+	{
+		// Data, don't care
+		queue->pop();
+		nlassert(!queue->empty());
+		uint8 *buffer;
+		uint32 size;
+		// User ptr, need to decrease ref
+		queue->front(buffer, size);
+		CQuicUserContext *user;
+		nlassert(size == sizeof(user));
+		memcpy(&user, buffer, size);
+		// Decrease ref count after pop
+		CQuicUserContextRelease releaseUser(user);
+		queue->pop();
+	}
+}
+
 // void CQuicTransceiver::sendDatagram(CQuicUserContext *user, const uint8 *buffer, uint32 size)
 //{
 //	QUIC_BUFFER *buf = new QUIC_BUFFER(); // wow leak :)
@@ -768,6 +794,11 @@ NLMISC::CBufFIFO *CQuicTransceiver::swapWriteQueue(NLMISC::CBufFIFO *writeQueue)
 	return previous;
 }
 
+void CQuicTransceiver::clearQueue(NLMISC::CBufFIFO *writeQueue)
+{
+
+}
+
 bool CQuicTransceiver::sendDatagramSwap(CQuicUserContext *user, NLMISC::CBitMemStream &buffer)
 {
 	return false;

diff --git a/ryzom/server/src/frontend_service/quic_transceiver.h b/ryzom/server/src/frontend_service/quic_transceiver.h
@@ -242,6 +242,9 @@ class CQuicTransceiver
 	/// Set new write queue for incoming messages (thread-safe because mutexed)
 	NLMISC::CBufFIFO *swapWriteQueue(NLMISC::CBufFIFO *writeQueue);
 
+	/// Clear a write queue safely
+	void clearQueue(NLMISC::CBufFIFO *writeQueue);
+
 	/// Check if still listening
 	bool listening();