Tweaks to assert and debug output for test harness

P4:6570984,6570997

Author: zpostfacto

src/steamnetworkingsockets/clientlib/steamnetworkingsockets_lowlevel.cpp

@@ -2193,7 +2193,7 @@ int g_nRateLimitSpewCount;
 ESteamNetworkingSocketsDebugOutputType g_eSystemSpewLevel = k_ESteamNetworkingSocketsDebugOutputType_None; // Option selected by the "system" (environment variable, etc)
 ESteamNetworkingSocketsDebugOutputType g_eAppSpewLevel = k_ESteamNetworkingSocketsDebugOutputType_Msg; // Option selected by app
 ESteamNetworkingSocketsDebugOutputType g_eDefaultGroupSpewLevel = k_ESteamNetworkingSocketsDebugOutputType_Msg; // Effective value
-static FSteamNetworkingSocketsDebugOutput s_pfnDebugOutput = nullptr;
+FSteamNetworkingSocketsDebugOutput g_pfnDebugOutput = nullptr;
 void (*g_pfnPreFormatSpewHandler)( ESteamNetworkingSocketsDebugOutputType eType, bool bFmt, const char* pstrFile, int nLine, const char *pMsg, va_list ap ) = SteamNetworkingSockets_DefaultPreFormatDebugOutputHandler;
 static bool s_bSpewInitted = false;
 
@@ -2267,7 +2267,7 @@ static void InitSpew()
 static void KillSpew()
 {
 	g_eDefaultGroupSpewLevel = g_eSystemSpewLevel = g_eAppSpewLevel = k_ESteamNetworkingSocketsDebugOutputType_None;
-	s_pfnDebugOutput = nullptr;
+	g_pfnDebugOutput = nullptr;
 	s_bSpewInitted = false;
 	s_bNeedToFlushSystemSpew = false;
 	if ( g_pFileSystemSpew )
@@ -2521,12 +2521,12 @@ void SteamNetworkingSockets_SetDebugOutputFunction( ESteamNetworkingSocketsDebug
 {
 	if ( pfnFunc && eDetailLevel > k_ESteamNetworkingSocketsDebugOutputType_None )
 	{
-		SteamNetworkingSocketsLib::s_pfnDebugOutput = pfnFunc;
+		SteamNetworkingSocketsLib::g_pfnDebugOutput = pfnFunc;
 		SteamNetworkingSocketsLib::g_eAppSpewLevel = ESteamNetworkingSocketsDebugOutputType( eDetailLevel );
 	}
 	else
 	{
-		SteamNetworkingSocketsLib::s_pfnDebugOutput = nullptr;
+		SteamNetworkingSocketsLib::g_pfnDebugOutput = nullptr;
 		SteamNetworkingSocketsLib::g_eAppSpewLevel = k_ESteamNetworkingSocketsDebugOutputType_None;
 	}
 
@@ -2713,7 +2713,7 @@ STEAMNETWORKINGSOCKETS_INTERFACE void SteamNetworkingSockets_DefaultPreFormatDeb
 	}
 
 	// Invoke callback
-	FSteamNetworkingSocketsDebugOutput pfnDebugOutput = s_pfnDebugOutput;
+	FSteamNetworkingSocketsDebugOutput pfnDebugOutput = g_pfnDebugOutput;
 	if ( pfnDebugOutput )
 		pfnDebugOutput( eType, buf );
 }

src/steamnetworkingsockets/clientlib/steamnetworkingsockets_lowlevel.h

@@ -302,6 +302,7 @@ inline bool BRateLimitSpew( SteamNetworkingMicroseconds usecNow )
 extern ESteamNetworkingSocketsDebugOutputType g_eDefaultGroupSpewLevel;
 extern void ReallySpewTypeFmt( int eType, PRINTF_FORMAT_STRING const char *pFmt, ... ) FMTFUNCTION( 2, 3 );
 extern void (*g_pfnPreFormatSpewHandler)( ESteamNetworkingSocketsDebugOutputType eType, bool bFmt, const char* pstrFile, int nLine, const char *pMsg, va_list ap );
+extern FSteamNetworkingSocketsDebugOutput g_pfnDebugOutput;
 
 #define SpewTypeGroup( eType, nGroup, ... ) ( ( (eType) <= (nGroup) ) ? ReallySpewTypeFmt( (eType), __VA_ARGS__ ) : (void)0 )
 #define SpewMsgGroup( nGroup, ... ) SpewTypeGroup( k_ESteamNetworkingSocketsDebugOutputType_Msg, (nGroup), __VA_ARGS__ )

src/tier0/dbg.cpp

@@ -11,6 +11,8 @@
 #ifdef STEAMNETWORKINGSOCKETS_FOREXPORT
 #include "../steamnetworkingsockets/clientlib/steamnetworkingsockets_lowlevel.h"
 using namespace SteamNetworkingSocketsLib;
+#elif defined ( STEAMDATAGRAM_GAMECOORDINATOR_FOREXPORT )
+extern void SteamDatagramGame_AssertFailed( bool bFmt, const char* pstrFile, unsigned int nLine, const char *pMsg, va_list ap );
 #endif
 
 #if defined(_WIN32) && !defined(_XBOX)
@@ -99,6 +101,8 @@ void AssertMsgImplementationV( bool _bFatal, bool bFmt, const char* pstrFile, un
 
 	#ifdef STEAMNETWORKINGSOCKETS_FOREXPORT
 		(*g_pfnPreFormatSpewHandler)( k_ESteamNetworkingSocketsDebugOutputType_Bug, bFmt, pstrFile, nLine, pMsg, ap );
+	#elif defined ( STEAMDATAGRAM_GAMECOORDINATOR_FOREXPORT )
+		SteamDatagramGame_AssertFailed( bFmt, pstrFile, nLine, pMsg, ap );
 	#else
 		fflush(stdout);
 		if ( pstrFile )