Changeset 17f28a1 in opengl-game

Timestamp:

Jun 19, 2019, 7:22:38 PM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

9d4456b, f024d59

Parents:

4762301

Message:

Improve the formatting for the crash log on OSX

Files:

• CrashLogger.cpp (modified) (9 diffs)
• makefile (modified) (1 diff)

CrashLogger.cpp

@@ -145 +145 @@
 
    size_t funcnamesize = 1024;
-   char funcname[1024];
+   char* funcname = (char*)malloc(sizeof(char) * funcnamesize);
 
    // iterate over the returned symbol lines
@@ -164 +164 @@
       }
 
-      if (begin_name && begin_offset && (begin_name < begin_offset )) {
+      write(fd_out, "  ", 2);
+      if (begin_name && begin_offset && (begin_name < begin_offset)) {
          *begin_name++ = '\0';
          *begin_offset++ = '\0';
@@ -176 +177 @@
          if (status == 0)  {
             funcname = ret; // use possibly realloc()-ed string
-            write(fd_out, "  ", 2);
             write(fd_out, symbollist[i], strlen(symbollist[i]));
             write(fd_out, " ", 1);
@@ -183 +183 @@
          } else {
             // demangling failed. Output function name as a C function with no arguments.
-            write(fd_out, "  ", 2);
             write(fd_out, symbollist[i], strlen(symbollist[i]));
             write(fd_out, " ", 1);
@@ -190 +189 @@
          }
          write(fd_out, begin_offset, strlen(begin_offset));
-         write(fd_out, "\n", 1);
-      } else {`
+      } else {
          // couldn't parse the line? print the whole line.
          write(fd_out, symbollist[i], strlen(symbollist[i]));
       }
+      write(fd_out, "\n", 1);
 #else
       for (char *p = symbollist[i]; *p; p++) {
@@ -206 +205 @@
       }
 
+      write(fd_out, "  ", 2);
       if (begin_name && end_offset && (begin_name < end_offset)) {
          *begin_name++ = '\0';
@@ -219 +219 @@
          char* ret = abi::__cxa_demangle(begin_name, funcname, &funcnamesize, &status);
 
-         write(fd_out, "  ", 2);
          write(fd_out, symbollist[i], strlen(symbollist[i]));
          write(fd_out, " ( ", 3);
@@ -226 +225 @@
          } else {
             write(fd_out, begin_name, strlen(begin_name));
-         }
+         }
+
          if (begin_offset) {
             write(fd_out, " + ", 3);
@@ -235 +235 @@
          write(fd_out, ") ", 1);
          write(fd_out, end_offset, strlen(end_offset));
-         write(fd_out, "\n", 1);
       } else {
          // couldn't parse the line? print the whole line.
          write(fd_out, symbollist[i], strlen(symbollist[i]));
       }
+      write(fd_out, "\n", 1);
 #endif
    }
 
+   free(funcname);
    free(symbollist);
 

makefile

@@ -2 +2 @@
 CC = g++
 CFLAGS = -std=c++0x -Wall -pedantic -rdynamic
+# -rdynamic is to generate debug info for dynamic symbols on debian-based 
+# systems (tested on Linux Mint)
+# for OSX, using -g generates a newgame.dSYS directory which has debug symbols.
+# However, this has no effect on the stack trace, so there must be a way to specify a *.dSYS directory when running ./newgame
+# or to instead put thos symbols directly into the executable, like -rdynamic does for Linux
 #-Wextra -fno-inline