BLI_assert: print a backtrace with the error
authorCampbell Barton <ideasman42@gmail.com>
Mon, 17 Nov 2014 23:20:56 +0000 (00:20 +0100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 17 Nov 2014 23:20:56 +0000 (00:20 +0100)
Add BLI_system_backtrace()

source/blender/blenlib/BLI_system.h
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/intern/system.c
source/blender/makesrna/intern/makesrna.c
source/creator/creator.c

index 8cdc9e4e6c58ce33053f0d51e56ec17d447cde15..bc81b85303df501d5014782b2385c057831b23b5 100644 (file)
 
 int BLI_cpu_support_sse2(void);
 
+#if !defined(NDEBUG) && !defined(__BLI_UTILDEFINES_H__)
+void BLI_system_backtrace(FILE *fp);
+#endif
+
 /* getpid */
 #ifdef WIN32
 #  define BLI_SYSTEM_PID_H <process.h>
@@ -35,4 +39,3 @@ int BLI_cpu_support_sse2(void);
 #endif
 
 #endif  /* __BLI_SYSTEM_H__ */
-
index 16d3c2f8a4286a9123a81cfa08f7d5b11128c3f7..a6dee7fd263ad8366f4743ac0068ddfd99a89041 100644 (file)
  * for aborting need to define WITH_ASSERT_ABORT
  */
 #ifndef NDEBUG
+extern void BLI_system_backtrace(FILE *fp);
 #  ifdef WITH_ASSERT_ABORT
 #    define _BLI_DUMMY_ABORT abort
 #  else
 #    define BLI_assert(a)                                                     \
        (void)((!(a)) ?  (                                                        \
                (                                                                     \
+               BLI_system_backtrace(stderr),                                         \
                fprintf(stderr,                                                       \
                        "BLI_assert failed: %s:%d, %s(), at \'%s\'\n",                    \
                        __FILE__, __LINE__, __func__, STRINGIFY(a)),                      \
index e6389bc68f3159c072de54b05a752805a7b92436..51b8efbb79fc8f33af42e5baba4644c82280c849 100644 (file)
  *  \ingroup bli
  */
 
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "BLI_system.h"
 
+/* for backtrace */
+#if defined(__linux__) || defined(__APPLE__)
+#  include <execinfo.h>
+#elif defined(_MSV_VER)
+#  include <DbgHelp.h>
+#endif
+
 int BLI_cpu_support_sse2(void)
 {
 #if defined(__x86_64__) || defined(_M_X64)
@@ -57,3 +66,69 @@ int BLI_cpu_support_sse2(void)
 #endif
 }
 
+/**
+ * Write a backtrace into a file for systems which support it.
+ */
+void BLI_system_backtrace(FILE *fp)
+{
+       /* ------------- */
+       /* Linux / Apple */
+#if defined(__linux__) || defined(__APPLE__)
+
+#define SIZE 100
+       void *buffer[SIZE];
+       int nptrs;
+       char **strings;
+       int i;
+
+       /* include a backtrace for good measure */
+       nptrs = backtrace(buffer, SIZE);
+       strings = backtrace_symbols(buffer, nptrs);
+       for (i = 0; i < nptrs; i++) {
+               fputs(strings[i], fp);
+               fputc('\n', fp);
+       }
+
+       free(strings);
+#undef SIZE
+
+       /* -------- */
+       /* Windows  */
+#elif defined(_MSC_VER)
+
+       (void)fp;
+#if 0
+#define MAXSYMBOL 256
+       unsigned short  i;
+       void *stack[SIZE];
+       unsigned short nframes;
+       SYMBOL_INFO     *symbolinfo;
+       HANDLE process;
+
+       process = GetCurrentProcess();
+
+       SymInitialize(process, NULL, true);
+
+       nframes = CaptureStackBackTrace(0, SIZE, stack, NULL);
+       symbolinfo = MEM_callocN(sizeof(SYMBOL_INFO) + MAXSYMBOL * sizeof(char), "crash Symbol table");
+       symbolinfo->MaxNameLen = MAXSYMBOL - 1;
+       symbolinfo->SizeOfStruct = sizeof(SYMBOL_INFO);
+
+       for (i = 0; i < nframes; i++) {
+               SymFromAddr(process, ( DWORD64 )( stack[ i ] ), 0, symbolinfo);
+
+               fprintf(fp, "%u: %s - 0x%0X\n", nframes - i - 1, symbolinfo->Name, symbolinfo->Address);
+       }
+
+       MEM_freeN(symbolinfo);
+#undef MAXSYMBOL
+#endif
+
+       /* ------------------ */
+       /* non msvc/osx/linux */
+#else
+       (void)fp;
+#endif
+
+}
+/* end BLI_system_backtrace */
index 9b33e1f5c286d6300bfd515a845e832bc52964d8..ca9ff4998018f78d9f06464567dabf91a6ce88e5 100644 (file)
 #  endif
 #endif
 
+/* stub for BLI_abort() */
+#ifndef NDEBUG
+void BLI_system_backtrace(FILE *fp)
+{
+       (void)fp;
+}
+#endif
+
 /* Replace if different */
 #define TMP_EXT ".tmp"
 
index be03ffe0bda1c73a30a8c2f72f3db7209d82357c..f872398300a9dabe04dd0277c8fb66c22fbc49a9 100644 (file)
 #  include "utfconv.h"
 #endif
 
-/* for backtrace */
-#if defined(__linux__) || defined(__APPLE__)
-#  include <execinfo.h>
-#elif defined(_MSV_VER)
-#  include <DbgHelp.h>
-#endif
-
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
@@ -515,73 +508,12 @@ static int set_fpe(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(dat
        return 0;
 }
 
-#if defined(__linux__) || defined(__APPLE__)
-
-/* Unix */
 static void blender_crash_handler_backtrace(FILE *fp)
 {
-#define SIZE 100
-       void *buffer[SIZE];
-       int nptrs;
-       char **strings;
-       int i;
-
        fputs("\n# backtrace\n", fp);
-
-       /* include a backtrace for good measure */
-       nptrs = backtrace(buffer, SIZE);
-       strings = backtrace_symbols(buffer, nptrs);
-       for (i = 0; i < nptrs; i++) {
-               fputs(strings[i], fp);
-               fputc('\n', fp);
-       }
-
-       free(strings);
-#undef SIZE
+       BLI_system_backtrace(fp);
 }
 
-#elif defined(_MSC_VER)
-
-static void blender_crash_handler_backtrace(FILE *fp)
-{
-       (void)fp;
-
-#if 0
-#define MAXSYMBOL 256
-       unsigned short  i;
-       void *stack[SIZE];
-       unsigned short nframes;
-       SYMBOL_INFO     *symbolinfo;
-       HANDLE process;
-
-       process = GetCurrentProcess();
-
-       SymInitialize(process, NULL, true);
-
-       nframes = CaptureStackBackTrace(0, SIZE, stack, NULL);
-       symbolinfo = MEM_callocN(sizeof(SYMBOL_INFO) + MAXSYMBOL * sizeof(char), "crash Symbol table");
-       symbolinfo->MaxNameLen = MAXSYMBOL - 1;
-       symbolinfo->SizeOfStruct = sizeof(SYMBOL_INFO);
-
-       for (i = 0; i < nframes; i++) {
-               SymFromAddr(process, ( DWORD64 )( stack[ i ] ), 0, symbolinfo);
-
-               fprintf(fp, "%u: %s - 0x%0X\n", nframes - i - 1, symbolinfo->Name, symbolinfo->Address);
-       }
-
-       MEM_freeN(symbolinfo);
-#endif
-}
-
-#else  /* non msvc/osx/linux */
-
-static void blender_crash_handler_backtrace(FILE *fp)
-{
-       (void)fp;
-}
-
-#endif
-
 static void blender_crash_handler(int signum)
 {