Changeset 6abfd07 in opengl-game for new-game.cpp

Timestamp:

May 31, 2019, 6:26:19 PM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

b373466

Parents:

a23fc08

Message:

Create a log with a stack-trace when the game crashes

File:

• new-game.cpp (modified) (4 diffs)

new-game.cpp

@@ -35 +35 @@
 #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
+#include "CrashLogger.h"
 
 using namespace std;
@@ -300 +291 @@
 */
 
-CrashLogger logger;
-
 // Helps to test logging during crashes
-/*
-void badFunc() {
+int badFunc() {
    int* test = NULL;
+
+   string test2 = "lol";
+   cout << test2 << endl;
+
    *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
+   return *test;
+}
+
+int __main(int argc, char* argv[]);
 
 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);
-   }
+   CrashLogger logger(__main, argc, argv);
 
    exit(0);
@@ -334 +311 @@
 
 int __main(int argc, char* argv[]) {
-#endif
    cout << "New OpenGL Game" << endl;
 
@@ -1023 +999 @@
       delete *it;
    }
-}
-
-#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
+
+   return 0;
+}
 
 void glfw_error_callback(int error, const char* description) {