Fixed an infinite recursion when a server output callback is raising.

Replaced Windows' API in favour of cross-platform CThreadMutex.
Removed some duplicate code.

Author: jordanbriere

src/core/modules/listeners/listeners_manager.cpp

@@ -29,6 +29,7 @@
 //-----------------------------------------------------------------------------
 #include "listeners_manager.h"
 #include "sp_main.h"
+#include "utilities/sp_util.h"
 
 
 //-----------------------------------------------------------------------------
@@ -171,12 +172,7 @@ SpewRetval_t SP_SpewOutput( SpewType_t spewType, const tchar *pMsg )
 {
 	static CServerOutputListenerManager *pManager = GetOnServerOutputListenerManager();
 
-	bool block = false;
-	EnterCriticalSection(&pManager->m_pCriticalSection); {
-		block = pManager->CallCallbacks((MessageSeverity)spewType, pMsg);
-	} LeaveCriticalSection(&pManager->m_pCriticalSection);
-
-	if (!block && pManager->m_pOldSpewOutputFunc) {
+	if (!pManager->CallCallbacks((MessageSeverity)spewType, pMsg) && pManager->m_pOldSpewOutputFunc) {
 		return pManager->m_pOldSpewOutputFunc(spewType, pMsg);
 	}
 
@@ -190,12 +186,7 @@ class SPLoggingListener: public ILoggingListener
 	{
 		static CServerOutputListenerManager *pManager = GetOnServerOutputListenerManager();
 
-		bool block = false;
-		EnterCriticalSection(&pManager->m_pCriticalSection); {
-			block = pManager->CallCallbacks((MessageSeverity)pContext->m_Severity, pMessage);
-		} LeaveCriticalSection(&pManager->m_pCriticalSection);
-
-		if (!block)
+		if (!pManager->CallCallbacks((MessageSeverity)pContext->m_Severity, pMessage))
 		{
 			// Restore the old logging state before SP has been loaded
 			LoggingSystem_PopLoggingState(false);
@@ -230,7 +221,6 @@ CServerOutputListenerManager::CServerOutputListenerManager()
 	:m_pOldSpewOutputFunc(NULL)
 #endif
 {
-	InitializeCriticalSection(&m_pCriticalSection);
 }
 
 
@@ -280,15 +270,18 @@ void CServerOutputListenerManager::Finalize()
 bool CServerOutputListenerManager::CallCallbacks(MessageSeverity severity, const tchar *pMsg)
 {
 	bool block = false;
-	FOR_EACH_VEC(m_vecCallables, i) {
-		BEGIN_BOOST_PY() 
-			object return_value = m_vecCallables[i](severity, pMsg);
-
-			if (!return_value.is_none() && extract<OutputReturn>(return_value) == OUTPUT_BLOCK)
-				block = true;
-
-		END_BOOST_PY_NORET()
-	}
+	m_Mutex.Lock(); {
+		FOR_EACH_VEC(m_vecCallables, i) {
+			try {
+				object return_value = m_vecCallables[i](severity, pMsg);
+
+				if (!return_value.is_none() && extract<OutputReturn>(return_value) == OUTPUT_BLOCK)
+					block = true;
+			} catch (...) {
+				PrintCurrentException(false);
+			}
+		}
+	} m_Mutex.Unlock();
 	return block;
 }
 

src/core/modules/listeners/listeners_manager.h

@@ -38,9 +38,7 @@
 #include "dbg.h"
 #include "tier0/threadtools.h"
 
-#ifdef _WIN32
-	#include <Windows.h>
-#endif
+
 
 
 //-----------------------------------------------------------------------------
@@ -122,7 +120,7 @@ class CServerOutputListenerManager: public CListenerManager
 	bool CallCallbacks(MessageSeverity severity, const tchar *pMsg);
 
 public:
-	CRITICAL_SECTION m_pCriticalSection;
+	CThreadMutex m_Mutex;
 
 #if defined(ENGINE_ORANGEBOX) || defined(ENGINE_BMS) || defined(ENGINE_GMOD)
 	SpewOutputFunc_t m_pOldSpewOutputFunc;

src/core/utilities/sp_util.h

@@ -46,13 +46,13 @@ using namespace boost::python;
 //-----------------------------------------------------------------------------
 #define MAX_CHUNK 1024
 
-inline void ChunkedMsg(const char* msg)
+inline void ChunkedMsg(const char* msg, bool bLogged = true)
 {
 	char* pMsg = (char*) msg;
 	int iLen = strlen(msg);
 
 	while(iLen > 0) {
-		Msg("%s", pMsg);
+		bLogged ? Msg("%s", pMsg) : printf("%s", pMsg);
 		pMsg += MAX_CHUNK-1;
 		iLen -= MAX_CHUNK-1;
 	}
@@ -61,7 +61,7 @@ inline void ChunkedMsg(const char* msg)
 //-----------------------------------------------------------------------------
 // Prints and clear the current exception.
 //-----------------------------------------------------------------------------
-inline void PrintCurrentException()
+inline void PrintCurrentException(bool bLogged = true)
 {
 	if (PyErr_Occurred())
 	{
@@ -79,7 +79,7 @@ inline void PrintCurrentException()
 		const char* pMsg = extract<const char *>(str("\n").join(format_exception(hType, hValue, hTraceback)));
 
 		// Send the message in chunks, because it can get quite big.
-		ChunkedMsg(pMsg);
+		ChunkedMsg(pMsg, bLogged);
 
 		PyErr_Clear();
 	}