Updated call stack logging

Neko-Box-Coder · Aug 13, 2023 · 61dcada · 61dcada
1 parent fcb2db6
commit 61dcada
Show file tree

Hide file tree

Showing 72 changed files with 227 additions and 836 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,6 +27,7 @@ set(ssGUI_BUILD_EXAMPLES    ON          CACHE BOOL      "Build examples")
 set(ssGUI_LOG_LEVEL         "Warning"   CACHE STRING    "Log level")
 set(ssGUI_LOG_TAG           "None"      CACHE STRING    "Log tag (overrides level)")
 set(ssGUI_LOG_MANAGER_STATE OFF         CACHE BOOL      "Log all the state in ssGUIManager")
+set(ssGUI_USE_LOG_FUNC      OFF         CACHE BOOL      "Logs all recorded function call")
 
 #Dropdown
 set_property(CACHE ssGUI_LOG_LEVEL PROPERTY STRINGS "None" 
@@ -444,6 +445,9 @@ if(ssGUI_LOG_MANAGER_STATE)
     target_compile_definitions(ssGUI PUBLIC SSGUI_LOG_MANAGER_STATE=1)
 endif()
 
+if(ssGUI_USE_LOG_FUNC)
+    target_compile_definitions(ssGUI PUBLIC ssGUI_USE_LOG_FUNC=1)
+endif()
 #See ssGUI/HelperClasses/LogWithTagsAndLevel.hpp for log tags and levels
 if(NOT ssGUI_LOG_TAG STREQUAL "None")
     if(ssGUI_LOG_TAG STREQUAL "ssGUI_MANAGER_TAG")

diff --git a/Include/ssGUI/Backend/Mocks/MockMacro.hpp b/Include/ssGUI/Backend/Mocks/MockMacro.hpp
@@ -1,7 +1,7 @@
 #ifndef SSGUI_MOCK_MACRO_H
 #define SSGUI_MOCK_MACRO_H
 
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 #define SSGUI_MOCK_PASSTHROUGH(funcOp)\
 do\

diff --git a/Include/ssGUI/Enums/SystemKey.hpp b/Include/ssGUI/Enums/SystemKey.hpp
@@ -7,7 +7,7 @@
 #include <cstdint>
 
 //We need to undefine the DELETE macro from Win32 because this collides with our enum name
-#ifdef SSGUI_MAIN_BACKEND_WIN32_OPENGL
+#ifdef DELETE
 #undef DELETE
 #endif
 

diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/MenuItem.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/MenuItem.hpp
@@ -16,7 +16,7 @@ namespace ssGUI
     ============================== C++ ==============================
     MenuItem::MenuItem()
     {
-        ssLOG_FUNC_ENTRY();
+        ssGUI_LOG_FUNC();
 
         RemoveAnyExtension<ssGUI::Extensions::BoxShadow>();
         RemoveAnyExtension<ssGUI::Extensions::RoundedCorners>();
@@ -72,8 +72,6 @@ namespace ssGUI
                 }
             }
         );
-
-        ssLOG_FUNC_EXIT();
     }
     =================================================================
     */

diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/StandardButton.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/StandardButton.hpp
@@ -32,7 +32,7 @@ namespace ssGUI
                                         ButtonMode(StandardButton::Mode::TEXT),
                                         ButtonImageWrapper(-1)
     {
-        ssLOG_FUNC_ENTRY();
+        ssGUI_LOG_FUNC();
         SetSize(glm::vec2(70, 35));
 
         //Adjust Extensions
@@ -160,8 +160,6 @@ namespace ssGUI
         UpdateButtonText();
         UpdateButtonImage();
         NotifyButtonEventCallbackManually();
-
-        ssLOG_FUNC_EXIT();
     }
     =================================================================
     */

diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/StandardWindow.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/StandardWindow.hpp
@@ -45,7 +45,7 @@ namespace ssGUI
                                         WindowIcon(-1),
                                         CloseButton(-1)
     {        
-        ssLOG_FUNC_ENTRY();
+        ssGUI_LOG_FUNC();
         SetMinSize(glm::vec2(100, 100));
         SetTitlebarHeight(26);
         
@@ -189,8 +189,6 @@ namespace ssGUI
                     standardWindow->CleanUpDefaultResources();
             }
         );
-        
-        ssLOG_FUNC_EXIT();
     }
     
     int StandardWindow::StandardWindowObjectCount = 0;

diff --git a/Include/ssGUI/HelperClasses/ImageUtil.hpp b/Include/ssGUI/HelperClasses/ImageUtil.hpp
@@ -462,7 +462,7 @@ namespace ssGUI
 
         static void ResizeBilinear(const uint8_t* inputPixels, int w, int h, uint8_t* outputPixels, int w2, int h2)
         {
-            ssLOG_FUNC_ENTRY();
+            ssGUI_LOG_FUNC();
             const uint8_t* a;
             const uint8_t* b;
             const uint8_t* c;
@@ -556,7 +556,6 @@ namespace ssGUI
                     offset++;
                 }
             }
-            ssLOG_FUNC_EXIT();
         }
 
         //Assuming is RGBA32

diff --git a/Include/ssGUI/HelperClasses/LogWithTagsAndLevel.hpp b/Include/ssGUI/HelperClasses/LogWithTagsAndLevel.hpp
@@ -61,6 +61,14 @@
 
 #endif
 
-//#undef ssLOG_LINE
+#if ssGUI_USE_LOG_FUNC
+    #define ssGUI_LOG_FUNC(...) ssLOG_FUNC(__VA_ARGS__)
+    #define ssGUI_LOG_FUNC_ENTRY(...) ssLOG_FUNC_ENTRY(__VA_ARGS__)
+    #define ssGUI_LOG_FUNC_EXIT(...) ssLOG_FUNC_EXIT(__VA_ARGS__)
+#else
+    #define ssGUI_LOG_FUNC(...) do{} while(0)
+    #define ssGUI_LOG_FUNC_ENTRY(...) do{} while(0)
+    #define ssGUI_LOG_FUNC_EXIT(...) do{} while(0)
+#endif
 
 #endif
diff --git a/Src/Examples/CustomGraphicsExampleV2.cpp b/Src/Examples/CustomGraphicsExampleV2.cpp
@@ -1,6 +1,6 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
 #include "glad/glad.h"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 //Modified from https://github.com/opengl-tutorials/ogl/blob/master/common/shader.cpp
 int CreateShaders(std::string& vertexShaderCode, std::string& fragmentShaderCode)

diff --git a/Src/Examples/Playground/ImageCanvasPlayground.cpp b/Src/Examples/Playground/ImageCanvasPlayground.cpp
@@ -2,7 +2,7 @@
 #include "ssGUI/GUIObjectClasses/CompositeClasses/ImageCanvas.hpp"
 #include "ssGUI/Extensions/Border.hpp"
 
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 #include "ExamplesResources.h"
 
 //Image Test

diff --git a/Src/Examples/Playground/SliderPlayground.cpp b/Src/Examples/Playground/SliderPlayground.cpp
@@ -3,7 +3,7 @@
 #include "ssGUI/GUIObjectClasses/CompositeClasses/ImageCanvas.hpp"
 #include "ssGUI/Extensions/Border.hpp"
 
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 #include "ExamplesResources.h"
 
 //Image Test

diff --git a/Src/Examples/Playground/StandardSliderPlayground.cpp b/Src/Examples/Playground/StandardSliderPlayground.cpp
@@ -5,7 +5,7 @@
 #include "ssGUI/GUIObjectClasses/CompositeClasses/ImageCanvas.hpp"
 #include "ssGUI/Extensions/Border.hpp"
 
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 #include "ExamplesResources.h"
 
 //Image Test

diff --git a/Src/Examples/Playground/StandardWindowPlayground.cpp b/Src/Examples/Playground/StandardWindowPlayground.cpp
@@ -2,7 +2,7 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
 #include "ssGUI/Extensions/Border.hpp"
 
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 #include "ExamplesResources.h"
 
 //Image Test

diff --git a/Src/Examples/Playground/TextfieldPlayground.cpp b/Src/Examples/Playground/TextfieldPlayground.cpp
@@ -1,6 +1,6 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
 
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 #include "ExamplesResources.h"
 
 int main()

diff --git a/Src/Tests/AutoTests/BackendTests/BackendFontTest_Auto.cpp b/Src/Tests/AutoTests/BackendTests/BackendFontTest_Auto.cpp
@@ -3,7 +3,7 @@
 #include "ssGUI/Backend/Interfaces/BackendFontInterface.hpp"
 #include "ssGUI/DataClasses/ImageData.hpp"
 #include "ssTest.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 #include "TestsResources.h"
 #include <fstream>

diff --git a/Src/Tests/AutoTests/BackendTests/BackendMainWindowTest_Auto.cpp b/Src/Tests/AutoTests/BackendTests/BackendMainWindowTest_Auto.cpp
@@ -1,6 +1,6 @@
 #include "ssGUI/Backend/BackendFactory.hpp"
 #include "ssGUI/Factory.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 #include "ssTest.hpp"
 
 #ifdef SSGUI_MAIN_BACKEND_SFML

diff --git a/Src/Tests/AutoTests/BackendTests/DynamicAtlasTest_Auto.cpp b/Src/Tests/AutoTests/BackendTests/DynamicAtlasTest_Auto.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/Backend/DynamicImageAtlas.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 #include "ssGUI/HelperClasses/OutputStreamUtil.hpp"
 

diff --git a/Src/Tests/ManualTests/BackendTests/BackendDrawingTest_Manual.cpp b/Src/Tests/ManualTests/BackendTests/BackendDrawingTest_Manual.cpp
@@ -1,6 +1,6 @@
 #include "ssGUI/Backend/BackendFactory.hpp"
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 #include <thread>
 #include "TestsResources.h"

diff --git a/Src/Tests/ManualTests/BackendTests/BackendMainWindowTest_Manual.cpp b/Src/Tests/ManualTests/BackendTests/BackendMainWindowTest_Manual.cpp
@@ -2,7 +2,7 @@
 #include "ssGUI/DataClasses/ImageData.hpp"
 #include "ssGUI/Factory.hpp"
 #include "ssGUI/HeaderGroups/InputGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 #include <thread>
 

diff --git a/Src/Tests/ManualTests/BackendTests/BackendSystemInputTest_Manual.cpp b/Src/Tests/ManualTests/BackendTests/BackendSystemInputTest_Manual.cpp
@@ -1,7 +1,7 @@
 #include "ssGUI/Backend/BackendFactory.hpp"
 #include "ssGUI/DataClasses/ImageData.hpp"
 #include "ssGUI/Factory.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 #include "ssGUI/HelperClasses/GenericInputToString.hpp"
 #include "TestsResources.h"
 

diff --git a/Src/Tests/ManualTests/BackendTests/MinimumRunningTest_Manual.cpp b/Src/Tests/ManualTests/BackendTests/MinimumRunningTest_Manual.cpp
@@ -1,7 +1,7 @@
 #include "ssGUI/Backend/BackendFactory.hpp"
 #include "ssGUI/DataClasses/ImageData.hpp"
 #include "ssGUI/Factory.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 #include <iostream>
 #include <thread>

diff --git a/Src/Tests/ManualTests/EventCallbackTests/ButtonStateChangedEventCallbackTest_Manual.cpp b/Src/Tests/ManualTests/EventCallbackTests/ButtonStateChangedEventCallbackTest_Manual.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 ssGUI::MainWindow* MainWindow;
 ssGUI::Button* TestButton;

diff --git a/Src/Tests/ManualTests/EventCallbackTests/FocusedAndLostEventCallbackTest_Manual.cpp b/Src/Tests/ManualTests/EventCallbackTests/FocusedAndLostEventCallbackTest_Manual.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 
 ssGUI::MainWindow* MainWindow;

diff --git a/Src/Tests/ManualTests/EventCallbackTests/ItemSelectedEventCallbackTest_Manual.cpp b/Src/Tests/ManualTests/EventCallbackTests/ItemSelectedEventCallbackTest_Manual.cpp
@@ -1,6 +1,6 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
 #include "ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 ssGUI::ssGUIManager* Manager;
 ssGUI::MainWindow* MainWindow;

diff --git a/Src/Tests/ManualTests/GUIObjectTests/ButtonTest_Manual.cpp b/Src/Tests/ManualTests/GUIObjectTests/ButtonTest_Manual.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 ssGUI::MainWindow* MainWindow = nullptr;
 ssGUI::ssGUIManager* Manager = nullptr;

diff --git a/Src/Tests/ManualTests/GUIObjectTests/CheckboxTest_Manual.cpp b/Src/Tests/ManualTests/GUIObjectTests/CheckboxTest_Manual.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 ssGUI::MainWindow* MainWindow = nullptr;
 ssGUI::ssGUIManager* Manager = nullptr;

diff --git a/Src/Tests/ManualTests/GUIObjectTests/ImageTest_Manual.cpp b/Src/Tests/ManualTests/GUIObjectTests/ImageTest_Manual.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 #include "TestsResources.h"
 

diff --git a/Src/Tests/ManualTests/GUIObjectTests/MenuTest_Manual.cpp b/Src/Tests/ManualTests/GUIObjectTests/MenuTest_Manual.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 ssGUI::MainWindow* MainWindow = nullptr;
 ssGUI::ssGUIManager* Manager = nullptr;

diff --git a/Src/Tests/ManualTests/GUIObjectTests/TextFieldTest_Manual.cpp b/Src/Tests/ManualTests/GUIObjectTests/TextFieldTest_Manual.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 #include <cassert>
 
 ssGUI::MainWindow* MainWindow = nullptr;

diff --git a/Src/Tests/ManualTests/GUIObjectTests/TextTest_Manual.cpp b/Src/Tests/ManualTests/GUIObjectTests/TextTest_Manual.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 #include "TestsResources.h"
 
 ssGUI::MainWindow* MainWindow = nullptr;

diff --git a/Src/Tests/ManualTests/GUIObjectTests/WindowTest_Manual.cpp b/Src/Tests/ManualTests/GUIObjectTests/WindowTest_Manual.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 ssGUI::MainWindow* MainWindow = nullptr;
 ssGUI::ssGUIManager* Manager = nullptr;

diff --git a/Src/Tests/ManualTests/ManualTestTemplate.cpp b/Src/Tests/ManualTests/ManualTestTemplate.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 //[Variables Declaration]
 

diff --git a/Src/Tests/ManualTests/ManualTestTemplateWithModes.cpp b/Src/Tests/ManualTests/ManualTestTemplateWithModes.cpp
@@ -1,5 +1,5 @@
 #include "ssGUI/HeaderGroups/StandardGroup.hpp"
-#include "ssLogger/ssLog.hpp"
+#include "ssGUI/HelperClasses/LogWithTagsAndLevel.hpp"
 
 ssGUI::MainWindow* MainWindow = nullptr;
 ssGUI::ssGUIManager* Manager = nullptr;