networkingsocketslib: use new logger

networking_sockets_lib/steamnetworkingsockets.cpp

@@ -7,51 +7,55 @@
 #define STEAM_API_EXPORTS
 #include "steam/steam_gameserver.h"
 
-const std::chrono::time_point<std::chrono::high_resolution_clock> startup_counter = std::chrono::high_resolution_clock::now();
+// OS detection
-const std::chrono::time_point<std::chrono::system_clock> startup_time = std::chrono::system_clock::now();
+#include "common_helpers/os_detector.h"
 
 #ifndef EMU_RELEASE_BUILD
+#include "dbg_log/dbg_log.hpp"
+dbg_log dbg_logger("STEAM_LOG.txt");
+#endif
 
+#if defined(__LINUX__) || defined(GNUC) || defined(__MINGW32__) || defined(__MINGW64__) // MinGw
+    #define EMU_FUNC_NAME __PRETTY_FUNCTION__
+#else
+    #define EMU_FUNC_NAME __FUNCTION__##"()"
+#endif
+
+// PRINT_DEBUG definition
+#ifndef EMU_RELEASE_BUILD
+    #include "dbg_log/dbg_log.hpp"
     // we need this for printf specifiers for intptr_t such as PRIdPTR
     #include <inttypes.h>
     
-    #if defined(WIN32) || defined(_WIN32)
+    #if defined(__WINDOWS__)
         #define WIN32_LEAN_AND_MEAN
-        #include <Windows.h>
+        #include <windows.h>
 
-        #define PRINT_DEBUG(a, ...) do {                                                                                                                     \
+        #define PRINT_DEBUG_TID() (long long)GetCurrentThreadId()
-            auto __prnt_dbg_ctr = std::chrono::high_resolution_clock::now();                                                                                 \
+    #elif defined(__LINUX__)
-            auto __prnt_dbg_duration = __prnt_dbg_ctr - startup_counter;                                                                                     \
-            auto __prnt_dbg_micro = std::chrono::duration_cast<std::chrono::duration<unsigned long long, std::micro>>(__prnt_dbg_duration);                  \
-            auto __prnt_dbg_ms = std::chrono::duration_cast<std::chrono::duration<unsigned long long, std::milli>>(__prnt_dbg_duration);                     \
-            auto __prnt_dbg_f = fopen("NETWORKING_SOCKET_LIB_LOG.txt", "a");                                                                                 \
-            fprintf(__prnt_dbg_f, "[%llu ms, %llu us] [tid %lu] " a, __prnt_dbg_ms.count(), __prnt_dbg_micro.count(), GetCurrentThreadId(), ##__VA_ARGS__);  \
-            fclose(__prnt_dbg_f);                                                                                                                            \
-        } while (0)
-    #else
         #ifndef _GNU_SOURCE
             #define _GNU_SOURCE
         #endif // _GNU_SOURCE
-
         #include <unistd.h>
-        #include <sys/syscall.h>
         #include <sys/types.h>
 
-        #define PRINT_DEBUG(a, ...) do {                                                                                                                      \
+        #include <sys/syscall.h> // syscall
-            auto __prnt_dbg_ctr = std::chrono::high_resolution_clock::now();                                                                                  \
+
-            auto __prnt_dbg_duration = __prnt_dbg_ctr - startup_counter;                                                                                      \
+        #define PRINT_DEBUG_TID() (long long)syscall(SYS_gettid)
-            auto __prnt_dbg_micro = std::chrono::duration_cast<std::chrono::duration<unsigned long long, std::micro>>(__prnt_dbg_duration);                   \
+    #else
-            auto __prnt_dbg_ms = std::chrono::duration_cast<std::chrono::duration<unsigned long long, std::milli>>(__prnt_dbg_duration);                      \
+        #warning  "Unrecognized OS"
-            auto __prnt_dbg_f = fopen("NETWORKING_SOCKET_LIB_LOG.txt", "a");                                                                                  \
+
-            fprintf(__prnt_dbg_f, "[%llu ms, %llu us] [tid %ld] " a, __prnt_dbg_ms.count(), __prnt_dbg_micro.count(), syscall(SYS_gettid), ##__VA_ARGS__);    \
+        #define PRINT_DEBUG_TID() (long long)0
-            fclose(__prnt_dbg_f);                                                                                                                             \
-        } while (0)
     #endif
 
+    extern dbg_log dbg_logger;
+
+    #define PRINT_DEBUG(a, ...) do {                                                                \
+        dbg_logger.write("[tid %lld] %s " a, PRINT_DEBUG_TID(), EMU_FUNC_NAME, ##__VA_ARGS__);      \
+    } while (0)
+
 #else // EMU_RELEASE_BUILD
-
     #define PRINT_DEBUG(...)
-
 #endif // EMU_RELEASE_BUILD
 
 #if defined(WIN32) || defined(_WIN32)
@@ -64,7 +68,7 @@ const std::chrono::time_point<std::chrono::system_clock> startup_time = std::chr
 /*
 extern "C" __declspec( dllexport )  void *CreateInterface( const char *pName, int *pReturnCode )
 {
-    //PRINT_DEBUG("steamclient CreateInterface %s\n", pName);
+    //PRINT_DEBUG("steamclient CreateInterface %s", pName);
     HMODULE steam_api = LoadLibraryA(DLL_NAME);
     void *(__stdcall* create_interface)(const char*) = (void * (__stdcall *)(const char*))GetProcAddress(steam_api, "SteamInternal_CreateInterface");
 
@@ -117,32 +121,32 @@ class Networking_Utils_DLL : public steam_networkingutils_class
 
 SteamNetworkingMicroseconds GetLocalTimestamp() { return networking_utils->GetLocalTimestamp(); }
 bool CheckPingDataUpToDate( float flMaxAgeSeconds ) { return networking_utils->CheckPingDataUpToDate(flMaxAgeSeconds); }
-void a() { PRINT_DEBUG("Networking_Utils_DLL::a\n"); }
+void a() { PRINT_DEBUG("Networking_Utils_DLL::a"); }
-void b() { PRINT_DEBUG("Networking_Utils_DLL::b\n"); }
+void b() { PRINT_DEBUG("Networking_Utils_DLL::b"); }
-void c() { PRINT_DEBUG("Networking_Utils_DLL::c\n"); }
+void c() { PRINT_DEBUG("Networking_Utils_DLL::c"); }
-void d() { PRINT_DEBUG("Networking_Utils_DLL::d\n"); }
+void d() { PRINT_DEBUG("Networking_Utils_DLL::d"); }
-void e() { PRINT_DEBUG("Networking_Utils_DLL::e\n"); }
+void e() { PRINT_DEBUG("Networking_Utils_DLL::e"); }
-void f() { PRINT_DEBUG("Networking_Utils_DLL::f\n"); }
+void f() { PRINT_DEBUG("Networking_Utils_DLL::f"); }
-void g() { PRINT_DEBUG("Networking_Utils_DLL::g\n"); }
+void g() { PRINT_DEBUG("Networking_Utils_DLL::g"); }
-void h() { PRINT_DEBUG("Networking_Utils_DLL::h\n"); }
+void h() { PRINT_DEBUG("Networking_Utils_DLL::h"); }
-void i() { PRINT_DEBUG("Networking_Utils_DLL::i\n"); }
+void i() { PRINT_DEBUG("Networking_Utils_DLL::i"); }
-void j() { PRINT_DEBUG("Networking_Utils_DLL::j\n"); }
+void j() { PRINT_DEBUG("Networking_Utils_DLL::j"); }
 };
 
 template <class steam_networkingp2p_class>
 class Networking_P2P_DLL : public steam_networkingp2p_class
 {
     public:
-void a() { PRINT_DEBUG("Networking_P2P_DLL::a\n"); }
+void a() { PRINT_DEBUG("Networking_P2P_DLL::a"); }
-void b() { PRINT_DEBUG("Networking_P2P_DLL::b\n"); }
+void b() { PRINT_DEBUG("Networking_P2P_DLL::b"); }
-void c() { PRINT_DEBUG("Networking_P2P_DLL::c\n"); }
+void c() { PRINT_DEBUG("Networking_P2P_DLL::c"); }
-void d() { PRINT_DEBUG("Networking_P2P_DLL::d\n"); }
+void d() { PRINT_DEBUG("Networking_P2P_DLL::d"); }
-void e() { PRINT_DEBUG("Networking_P2P_DLL::e\n"); }
+void e() { PRINT_DEBUG("Networking_P2P_DLL::e"); }
-void f() { PRINT_DEBUG("Networking_P2P_DLL::f\n"); }
+void f() { PRINT_DEBUG("Networking_P2P_DLL::f"); }
-void g() { PRINT_DEBUG("Networking_P2P_DLL::g\n"); }
+void g() { PRINT_DEBUG("Networking_P2P_DLL::g"); }
-void h() { PRINT_DEBUG("Networking_P2P_DLL::h\n"); }
+void h() { PRINT_DEBUG("Networking_P2P_DLL::h"); }
-void i() { PRINT_DEBUG("Networking_P2P_DLL::i\n"); }
+void i() { PRINT_DEBUG("Networking_P2P_DLL::i"); }
-void j() { PRINT_DEBUG("Networking_P2P_DLL::j\n"); }
+void j() { PRINT_DEBUG("Networking_P2P_DLL::j"); }
 };
 
 static void *networking_sockets_gameserver;
@@ -153,25 +157,25 @@ static void *networking_p2p_gameserver;
 
 NETWORKING_SOCKET_LIB_API class ISteamNetworkingSockets *SteamNetworkingSockets()
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingSockets\n");
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingSockets");
     return (class ISteamNetworkingSockets *)networking_sockets;
 }
 
 NETWORKING_SOCKET_LIB_API class ISteamNetworkingSockets *SteamNetworkingSockets_LibV12()
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingSockets_LibV12\n");
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingSockets_LibV12");
     return SteamNetworkingSockets();
 }
 
 NETWORKING_SOCKET_LIB_API class ISteamNetworkingSockets *SteamGameServerNetworkingSockets()
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamGameServerNetworkingSockets\n");
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamGameServerNetworkingSockets");
     return (class ISteamNetworkingSockets *)networking_sockets_gameserver;
 }
 
 NETWORKING_SOCKET_LIB_API class ISteamNetworkingSockets *SteamGameServerNetworkingSockets_LibV12()
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamGameServerNetworkingSockets_LibV12\n");
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamGameServerNetworkingSockets_LibV12");
     return SteamGameServerNetworkingSockets();
 }
 
@@ -182,7 +186,7 @@ typedef void * ( S_CALLTYPE *FSteamInternal_CreateInterface )( const char *);
 
 NETWORKING_SOCKET_LIB_API bool SteamDatagramClient_Init_InternalV6( SteamDatagramErrMsg &errMsg, FSteamInternal_CreateInterface fnCreateInterface, HSteamUser hSteamUser, HSteamPipe hSteamPipe )
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramClient_Init_InternalV6 %u %u\n", hSteamUser, hSteamPipe);
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramClient_Init_InternalV6 %u %u", hSteamUser, hSteamPipe);
     ISteamClient *client = (ISteamClient *)fnCreateInterface(STEAMCLIENT_INTERFACE_VERSION);
     networking_sockets = client->GetISteamGenericInterface(hSteamUser, hSteamPipe, "SteamNetworkingSockets001");
     networking_utils = new Networking_Utils_DLL<ISteamNetworkingUtilsDll>( (ISteamNetworkingUtils *)client->GetISteamGenericInterface(hSteamUser, hSteamPipe, "SteamNetworkingUtils001") );
@@ -192,18 +196,18 @@ NETWORKING_SOCKET_LIB_API bool SteamDatagramClient_Init_InternalV6( SteamDatagra
 
 NETWORKING_SOCKET_LIB_API bool SteamDatagramClient_Init_InternalV9( SteamDatagramErrMsg &errMsg, FSteamInternal_CreateInterface fnCreateInterface, HSteamUser hSteamUser, HSteamPipe hSteamPipe )
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramClient_Init_InternalV9 %u %u\n", hSteamUser, hSteamPipe);
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramClient_Init_InternalV9 %u %u", hSteamUser, hSteamPipe);
     return SteamDatagramClient_Init_InternalV6(errMsg, fnCreateInterface, hSteamUser, hSteamPipe );
 }
 
 NETWORKING_SOCKET_LIB_API void SteamDatagramServer_Kill( )
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramServer_Kill\n");
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramServer_Kill");
 }
 
 NETWORKING_SOCKET_LIB_API void SteamNetworkingSockets_SetDebugOutputFunction( ESteamNetworkingSocketsDebugOutputType eDetailLevel, FSteamNetworkingSocketsDebugOutput pfnFunc )
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingSockets_SetDebugOutputFunction %i\n", eDetailLevel);
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingSockets_SetDebugOutputFunction %i", eDetailLevel);
     if (networking_utils) {
         ((Networking_Utils_DLL<ISteamNetworkingUtilsDll> *)networking_utils)->networking_utils->SetDebugOutputFunction(eDetailLevel, pfnFunc);
     }
@@ -215,17 +219,17 @@ typedef void ( S_CALLTYPE *FSteamAPI_RegisterCallResult)( class CCallbackBase *p
 typedef void ( S_CALLTYPE *FSteamAPI_UnregisterCallResult)( class CCallbackBase *pCallback, SteamAPICall_t hAPICall );
 NETWORKING_SOCKET_LIB_API void SteamDatagramClient_Internal_SteamAPIKludge( FSteamAPI_RegisterCallback fnRegisterCallback, FSteamAPI_UnregisterCallback fnUnregisterCallback, FSteamAPI_RegisterCallResult fnRegisterCallResult, FSteamAPI_UnregisterCallResult fnUnregisterCallResult )
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramClient_Internal_SteamAPIKludge\n");
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramClient_Internal_SteamAPIKludge");
 }
 
 NETWORKING_SOCKET_LIB_API void SteamDatagramClient_Kill()
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramClient_Kill\n");
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramClient_Kill");
 }
 
 NETWORKING_SOCKET_LIB_API bool SteamDatagramServer_Init_Internal( SteamDatagramErrMsg &errMsg, FSteamInternal_CreateInterface fnCreateInterface, HSteamUser hSteamUser, HSteamPipe hSteamPipe )
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramServer_Init_Internal %u %u\n", hSteamUser, hSteamPipe);
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamDatagramServer_Init_Internal %u %u", hSteamUser, hSteamPipe);
     ISteamClient *client = (ISteamClient *)fnCreateInterface(STEAMCLIENT_INTERFACE_VERSION);
     networking_sockets_gameserver = client->GetISteamGenericInterface(hSteamUser, hSteamPipe, "SteamNetworkingSockets001");
     networking_utils = new Networking_Utils_DLL<ISteamNetworkingUtilsDll>( (ISteamNetworkingUtils *)client->GetISteamGenericInterface(hSteamUser, hSteamPipe, "SteamNetworkingUtils001"));
@@ -236,18 +240,18 @@ NETWORKING_SOCKET_LIB_API bool SteamDatagramServer_Init_Internal( SteamDatagramE
 
 NETWORKING_SOCKET_LIB_API class ISteamNetworkingUtils *SteamNetworkingUtils()
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingUtils\n");
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingUtils");
     return (class ISteamNetworkingUtils *)networking_utils;
 }
 
 NETWORKING_SOCKET_LIB_API void *SteamNetworkingP2P()
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingP2P\n");
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingP2P");
     return networking_p2p;
 }
 
 NETWORKING_SOCKET_LIB_API void *SteamNetworkingP2PGameServer()
 {
-    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingP2PGameServer\n");
+    PRINT_DEBUG("SteamNetworkingSocketsLib::SteamNetworkingP2PGameServer");
     return NULL;
 }