ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix windows builds (stacktrace pthread debug)

This commit is contained in:
Robin Gareus 2021-07-14 16:04:07 +02:00
parent 46251c2068
commit c92dfed706
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/pbd/pbd/debug.h
View File

@ -30,8 +30,11 @@
#include "pbd/libpbd_visibility.h"
#include "pbd/timing.h"
#if defined(COMPILER_MSVC) && !defined(PTW32_VERSION)
#include <ardourext/pthread.h> // Gets us 'PTW32_VERSION'
/* check for PTW32_VERSION */
#ifdef COMPILER_MSVC
#include <ardourext/pthread.h>
#else
#include <pthread.h>
#endif
namespace PBD {

9
libs/pbd/stacktrace.cc
View File

@ -91,10 +91,9 @@ extern "C" {
void
PBD::stacktrace (std::ostream& out, int levels, int start)
{
unsigned int i;
void * stack[62]; // does not support more then 62 levels of stacktrace
void* stack[62]; // does not support more then 62 levels of stacktrace
unsigned short frames;
SYMBOL_INFO * symbol;
SYMBOL_INFO* symbol;
HANDLE process;
process = GetCurrentProcess();
@ -104,13 +103,13 @@ PBD::stacktrace (std::ostream& out, int levels, int start)
frames = CaptureStackBackTrace (0, 62, stack, NULL);
out << "Backtrace frames: " << frames << std::endl;
out << "Backtrace frames: " << (int) frames << std::endl;
symbol = (SYMBOL_INFO*)calloc (sizeof (SYMBOL_INFO) + 256 * sizeof (char), 1);
symbol->MaxNameLen = 255;
symbol->SizeOfStruct = sizeof (SYMBOL_INFO);
for (i = start; i < frames && (levels == 0 || i < levels); ++i) {
for (int i = start; i < frames && (levels == 0 || i < levels); ++i) {
SymFromAddr (process, (DWORD64)(stack[i]), 0, symbol);
out << string_compose (" %1: %2 - %3\n", frames - i - 1, symbol->Name, symbol->Address);
}