Changeset d9b6a1c in opengl-game

Timestamp:

May 24, 2019, 5:37:05 PM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

98f06d9

Parents:

caa2359

Message:

Print a stack trace in the event of a crash. Currently, the code for this on Windows outputs the stack trace to stderr, not to a log file.

Files:

• .gitignore (modified) (1 diff)
• Compiler.h (added)
• CrashLogger.cpp (added)
• CrashLogger.h (added)
• FileStackWalker.cpp (added)
• FileStackWalker.h (added)
• NewOpenGLGame.vcxproj (modified) (3 diffs)
• StackWalker.cpp (added)
• StackWalker.h (added)
• makefile (modified) (2 diffs)
• new-game.cpp (modified) (5 diffs)

.gitignore

@@ -5 +5 @@
 
 gl.log
+crash.log
 
 imgui.ini

NewOpenGLGame.vcxproj

@@ -135 +135 @@
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="CrashLogger.cpp" />
     <ClCompile Include="IMGUI\imgui.cpp" />
     <ClCompile Include="IMGUI\imgui_demo.cpp" />
@@ -141 +142 @@
     <ClCompile Include="logger.cpp" />
     <ClCompile Include="new-game.cpp" />
+    <ClCompile Include="StackWalker.cpp" />
     <ClCompile Include="stb_image_write.h" />
     <ClCompile Include="stb_image.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="CrashLogger.h" />
     <ClInclude Include="IMGUI\imgui.h" />
     <ClInclude Include="IMGUI\imgui_internal.h" />
@@ -152 +155 @@
     <ClInclude Include="imgui_impl_glfw_gl3.h" />
     <ClInclude Include="logger.h" />
+    <ClInclude Include="StackWalker.h" />
     <ClInclude Include="stb_image.h" />
     <ClInclude Include="utils.h" />

makefile

@@ -1 +1 @@
 OS = $(shell uname)
 CC = g++
-CFLAGS = -std=c++0x -Wall -pedantic#-Wextra
+CFLAGS = -std=c++0x -Wall -pedantic#-Wextra -fno-inline
 
 ifeq ($(OS),Darwin)
@@ -15 +15 @@
 # as this well prevent regenerating .o files for unchanged .cpp files
 
-newgame: new-game.cpp logger.cpp stb_image.cpp imgui_impl_glfw_gl3.cpp $(IMGUI_FILES)
+newgame: new-game.cpp logger.cpp stb_image.cpp imgui_impl_glfw_gl3.cpp CrashLogger.cpp $(IMGUI_FILES)
         $(CC) $^ $(DEP) $(CFLAGS) -o $@
 

new-game.cpp

@@ -32 +32 @@
 #include "logger.h"
 #include "utils.h"
+
+#include "Compiler.h"
+
+#ifdef WINDOWS
+   #include <windows.h>
+   #include <excpt.h>
+   #include <io.h>
+
+   #include "FileStackWalker.h"
+#else
+   // TODO: Move as much Windows crash-logging stuff into CrashLogger as well
+   #include "CrashLogger.h"
+#endif
 
 using namespace std;
@@ -212 +225 @@
 void calculateObjectBoundingBox(SceneObject* obj);
 
-void initializeParticleEffectBuffers(map<GLuint, BufferInfo>& shaderBufferInfo,
-                  map<ObjectType, ShaderModelGroup>& modelGroups,
-                  GLuint ubo);
-
 void populateBuffers(vector<SceneObject*>& objects,
                   map<GLuint, BufferInfo>& shaderBufferInfo,
@@ -297 +306 @@
 */
 
+CrashLogger logger;
+
+// Helps to test logging during crashes
+/*
+void badFunc() {
+   int* test = NULL;
+   *test = 1;
+}
+*/
+
+#ifdef WINDOWS
+
+// Give it a file handle to crash.log instead (using the code in CrashLogger.cpp)
+FileStackWalker sw(2);
+
+bool handleException(unsigned int expCode, EXCEPTION_POINTERS* pExp, HANDLE thread);
+#endif
+
 int main(int argc, char* argv[]) {
+#ifdef WINDOWS
+   __try {
+      __main(argc, argv);
+      // maybe do this and call a function inside CrashLogger
+      // In that case, also pass GetCurrentThread() as a parameter to then pass to handleException
+      // I could also move almost all of this into CrashLogger by creating a function in CrashLogger that takes a reference
+      // to the effective main function and, for Windows, wraps it in all this error-handling stuff
+   } __except( handleException(GetExceptionCode(), GetExceptionInformation(), GetCurrentThread()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_EXECUTE_HANDLER) {
+      _write(2, "CAUGHT\n", 7);
+   }
+
+   exit(0);
+}
+
+int __main(int argc, char* argv[]) {
+#endif
    cout << "New OpenGL Game" << endl;
 
@@ -309 +352 @@
    }
 
-#ifdef __APPLE__
+#ifdef MAC
    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
@@ -973 +1016 @@
       delete *it;
    }
-
-   return 0;
-}
+}
+
+#ifdef WINDOWS
+bool handleException(unsigned int expCode, EXCEPTION_POINTERS* pExp, HANDLE thread) {
+   if (pExp != NULL) {
+      sw.ShowCallstack(thread, pExp->ContextRecord);
+   }
+
+   if (expCode == EXCEPTION_ACCESS_VIOLATION) {
+      _write(2, "ACCESS VIOLATION\n", 17);
+   }
+
+   return true;
+}
+#endif
 
 void glfw_error_callback(int error, const char* description) {