database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge fix for 35987

Browse Source
This commit is contained in:
Vladislav Vaintroub
2008-09-15 17:11:41 +02:00
parent 94fad7c0c2 5343b7ae59
commit 26c48a8089
1 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
mysys/stacktrace.c
View File

@ -317,6 +317,7 @@ void my_write_core(int sig)
#else /* __WIN__*/ #else /* __WIN__*/
#include <dbghelp.h> #include <dbghelp.h>
#include <tlhelp32.h>
/* /*
Stack tracing on Windows is implemented using Debug Helper library(dbghelp.dll) Stack tracing on Windows is implemented using Debug Helper library(dbghelp.dll)
@ -409,6 +410,63 @@ void my_set_exception_pointers(EXCEPTION_POINTERS *ep)
exception_ptrs = ep; exception_ptrs = ep;
} }
/*
Get symbol path - semicolon-separated list of directories to search for debug
symbols. We expect PDB in the same directory as corresponding exe or dll,
so the path is build from directories of the loaded modules. If environment
variable _NT_SYMBOL_PATH is set, it's value appended to the symbol search path
*/
static void get_symbol_path(char *path, size_t size)
{
HANDLE hSnap;
char *envvar;
path[0]= '\0';
/*
Enumerate all modules, and add their directories to the path.
Avoid duplicate entries.
*/
hSnap= CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
if (hSnap != INVALID_HANDLE_VALUE)
{
BOOL ret;
MODULEENTRY32 mod;
mod.dwSize= sizeof(MODULEENTRY32);
for (ret= Module32First(hSnap, &mod); ret; ret= Module32Next(hSnap, &mod))
{
char *module_dir= mod.szExePath;
char *p= strrchr(module_dir,'\\');
if (!p)
{
/*
Path separator was not found. Not known to happen, if ever happens,
will indicate current directory.
*/
module_dir[0]= '.';
p= module_dir + 1;
}
*p++= ';';
*p= '\0';
if (!strstr(path, module_dir))
{
strncat(path, module_dir, size);
}
}
CloseHandle(hSnap);
}
/* Add _NT_SYMBOL_PATH, if present. */
envvar= getenv("_NT_SYMBOL_PATH");
if(envvar)
{
strncat(path, envvar, size);
}
}
#define MAX_SYMBOL_PATH 32768
/* Platform SDK in VS2003 does not have definition for SYMOPT_NO_PROMPTS*/ /* Platform SDK in VS2003 does not have definition for SYMOPT_NO_PROMPTS*/
#ifndef SYMOPT_NO_PROMPTS #ifndef SYMOPT_NO_PROMPTS
#define SYMOPT_NO_PROMPTS 0 #define SYMOPT_NO_PROMPTS 0
@ -425,6 +483,7 @@ void my_print_stacktrace(uchar* unused1, ulong unused2)
int i; int i;
CONTEXT context; CONTEXT context;
STACKFRAME64 frame={0}; STACKFRAME64 frame={0};
static char symbol_path[MAX_SYMBOL_PATH+1];
if(!exception_ptrs || !init_dbghelp_functions()) if(!exception_ptrs || !init_dbghelp_functions())
return; return;
@ -433,7 +492,8 @@ void my_print_stacktrace(uchar* unused1, ulong unused2)
context = *(exception_ptrs->ContextRecord); context = *(exception_ptrs->ContextRecord);
/*Initialize symbols.*/ /*Initialize symbols.*/
pSymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_NO_PROMPTS|SYMOPT_DEFERRED_LOADS|SYMOPT_DEBUG); pSymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_NO_PROMPTS|SYMOPT_DEFERRED_LOADS|SYMOPT_DEBUG);
pSymInitialize(hProcess,NULL,TRUE); get_symbol_path(symbol_path, MAX_SYMBOL_PATH);
pSymInitialize(hProcess, symbol_path, TRUE);
/*Prepare stackframe for the first StackWalk64 call*/ /*Prepare stackframe for the first StackWalk64 call*/
frame.AddrFrame.Mode= frame.AddrPC.Mode= frame.AddrStack.Mode= AddrModeFlat; frame.AddrFrame.Mode= frame.AddrPC.Mode= frame.AddrStack.Mode= AddrModeFlat;