Skip to content

G
git2
Commit cb4b3bdf by Edward Thomson
Options

win32: "crtdbg" is now "leakcheck" 

msvc crtdbg is a mouthfull that is not particularly indicative of what
it does.  Let's rename it to "win32 leakcheck".
parent a6d151bf
Showing with 183 additions and 731 deletions
src/alloc.c
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
#include "allocators/win32_crtdbg.h" #include "allocators/win32_crtdbg.h"
#if defined(GIT_MSVC_CRTDBG) #if defined(GIT_MSVC_CRTDBG)
# include "win32/w32_stack.h" # include "win32/w32_leakcheck.h"
# include "win32/w32_crtdbg_stacktrace.h"
#endif #endif
git_allocator git__allocator; git_allocator git__allocator;
...@@ -30,16 +29,16 @@ static int setup_default_allocator(void) ...@@ -30,16 +29,16 @@ static int setup_default_allocator(void)
#if defined(GIT_MSVC_CRTDBG) #if defined(GIT_MSVC_CRTDBG)
static void allocator_global_shutdown(void) static void allocator_global_shutdown(void)
{ {
git_win32__crtdbg_stacktrace_cleanup(); git_win32_leakcheck_stacktrace_cleanup();
git_win32__stack_cleanup(); git_win32_leakcheck_stack_cleanup();
} }
#endif #endif
int git_allocator_global_init(void) int git_allocator_global_init(void)
{ {
#if defined(GIT_MSVC_CRTDBG) #if defined(GIT_MSVC_CRTDBG)
git_win32__crtdbg_stacktrace_init(); git_win32_leakcheck_stacktrace_init();
git_win32__stack_init(); git_win32_leakcheck_stack_init();
if (git_runtime_shutdown_register(allocator_global_shutdown) < 0) if (git_runtime_shutdown_register(allocator_global_shutdown) < 0)
return -1; return -1;
......
src/allocators/win32_crtdbg.c
...@@ -9,26 +9,25 @@ ...@@ -9,26 +9,25 @@
#if defined(GIT_MSVC_CRTDBG) #if defined(GIT_MSVC_CRTDBG)
#include "win32/w32_stack.h" #include "win32/w32_leakcheck.h"
#include "win32/w32_crtdbg_stacktrace.h"
static void *crtdbg__malloc(size_t len, const char *file, int line) static void *crtdbg__malloc(size_t len, const char *file, int line)
{ {
void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
if (!ptr) git_error_set_oom(); if (!ptr) git_error_set_oom();
return ptr; return ptr;
} }
static void *crtdbg__calloc(size_t nelem, size_t elsize, const char *file, int line) static void *crtdbg__calloc(size_t nelem, size_t elsize, const char *file, int line)
{ {
void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
if (!ptr) git_error_set_oom(); if (!ptr) git_error_set_oom();
return ptr; return ptr;
} }
static char *crtdbg__strdup(const char *str, const char *file, int line) static char *crtdbg__strdup(const char *str, const char *file, int line)
{ {
char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
if (!ptr) git_error_set_oom(); if (!ptr) git_error_set_oom();
return ptr; return ptr;
} }
...@@ -68,7 +67,7 @@ static char *crtdbg__substrdup(const char *start, size_t n, const char *file, in ...@@ -68,7 +67,7 @@ static char *crtdbg__substrdup(const char *start, size_t n, const char *file, in
static void *crtdbg__realloc(void *ptr, size_t size, const char *file, int line) static void *crtdbg__realloc(void *ptr, size_t size, const char *file, int line)
{ {
void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
if (!new_ptr) git_error_set_oom(); if (!new_ptr) git_error_set_oom();
return new_ptr; return new_ptr;
} }
......
src/libgit2.c
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "transports/smart.h" #include "transports/smart.h"
#include "transports/http.h" #include "transports/http.h"
#include "transports/ssh.h" #include "transports/ssh.h"
#include "win32/w32_stack.h"
#ifdef GIT_OPENSSL #ifdef GIT_OPENSSL
# include <openssl/err.h> # include <openssl/err.h>
......
src/win32/w32_crtdbg_stacktrace.h deleted 100644 → 0
/*
* Copyright (C) the libgit2 contributors. All rights reserved.
*
* This file is part of libgit2, distributed under the GNU GPL v2 with
* a Linking Exception. For full terms see the included COPYING file.
*/
#ifndef INCLUDE_win32_w32_crtdbg_stacktrace_h__
#define INCLUDE_win32_w32_crtdbg_stacktrace_h__
#include "common.h"
#if defined(GIT_MSVC_CRTDBG)
#include <stdlib.h>
#include <crtdbg.h>
#include "git2/errors.h"
#include "strnlen.h"
/* MSVC CRTDBG memory leak reporting.
*
* We DO NOT use the "_CRTDBG_MAP_ALLOC" macro described in the MSVC
* documentation because all allocs/frees in libgit2 already go through
* the "git__" routines defined in this file. Simply using the normal
* reporting mechanism causes all leaks to be attributed to a routine
* here in util.h (ie, the actual call to calloc()) rather than the
* caller of git__calloc().
*
* Therefore, we declare a set of "git__crtdbg__" routines to replace
* the corresponding "git__" routines and re-define the "git__" symbols
* as macros. This allows us to get and report the file:line info of
* the real caller.
*
* We DO NOT replace the "git__free" routine because it needs to remain
* a function pointer because it is used as a function argument when
* setting up various structure "destructors".
*
* We also DO NOT use the "_CRTDBG_MAP_ALLOC" macro because it causes
* "free" to be remapped to "_free_dbg" and this causes problems for
* structures which define a field named "free".
*
* Finally, CRTDBG must be explicitly enabled and configured at program
* startup. See tests/main.c for an example.
*/
/**
* Initialize our memory leak tracking and de-dup data structures.
* This should ONLY be called by git_libgit2_init().
*/
void git_win32__crtdbg_stacktrace_init(void);
/**
* Shutdown our memory leak tracking and dump summary data.
* This should ONLY be called by git_libgit2_shutdown().
*
* We explicitly call _CrtDumpMemoryLeaks() during here so
* that we can compute summary data for the leaks. We print
* the stacktrace of each unique leak.
*
* This cleanup does not happen if the app calls exit()
* without calling the libgit2 shutdown code.
*
* This info we print here is independent of any automatic
* reporting during exit() caused by _CRTDBG_LEAK_CHECK_DF.
* Set it in your app if you also want traditional reporting.
*/
void git_win32__crtdbg_stacktrace_cleanup(void);
/**
* Checkpoint options.
*/
typedef enum git_win32__crtdbg_stacktrace_options {
/**
* Set checkpoint marker.
*/
GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK = (1 << 0),
/**
* Dump leaks since last checkpoint marker.
* May not be combined with __LEAKS_TOTAL.
*
* Note that this may generate false positives for global TLS
* error state and other global caches that aren't cleaned up
* until the thread/process terminates. So when using this
* around a region of interest, also check the final (at exit)
* dump before digging into leaks reported here.
*/
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK = (1 << 1),
/**
* Dump leaks since init. May not be combined
* with __LEAKS_SINCE_MARK.
*/
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL = (1 << 2),
/**
* Suppress printing during dumps.
* Just return leak count.
*/
GIT_WIN32__CRTDBG_STACKTRACE__QUIET = (1 << 3),
} git_win32__crtdbg_stacktrace_options;
/**
* Checkpoint memory state and/or dump unique stack traces of
* current memory leaks.
*
* @return number of unique leaks (relative to requested starting
* point) or error.
*/
GIT_EXTERN(int) git_win32__crtdbg_stacktrace__dump(
git_win32__crtdbg_stacktrace_options opt,
const char *label);
/**
* Construct stacktrace and append it to the global buffer.
* Return pointer to start of this string. On any error or
* lack of buffer space, just return the given file buffer
* so it will behave as usual.
*
* This should ONLY be called by our internal memory allocations
* routines.
*/
const char *git_win32__crtdbg_stacktrace(int skip, const char *file);
#endif
#endif
src/win32/w32_stack.h → src/win32/w32_leakcheck.h
...@@ -5,13 +5,21 @@ ...@@ -5,13 +5,21 @@
* a Linking Exception. For full terms see the included COPYING file. * a Linking Exception. For full terms see the included COPYING file.
*/ */
#ifndef INCLUDE_win32_w32_stack_h__ #ifndef INCLUDE_win32_leakcheck_h__
#define INCLUDE_win32_w32_stack_h__ #define INCLUDE_win32_leakcheck_h__
#include "common.h" #include "common.h"
#if defined(GIT_MSVC_CRTDBG) #if defined(GIT_MSVC_CRTDBG)
#include <stdlib.h>
#include <crtdbg.h>
#include "git2/errors.h"
#include "strnlen.h"
/* Stack frames (for stack tracing, below) */
/** /**
* This type defines a callback to be used to augment a C stacktrace * This type defines a callback to be used to augment a C stacktrace
* with "aux" data. This can be used, for example, to allow LibGit2Sharp * with "aux" data. This can be used, for example, to allow LibGit2Sharp
...@@ -24,7 +32,7 @@ ...@@ -24,7 +32,7 @@
* (de-duped at the C# layer) stacktrace. "aux_id" 0 is reserved * (de-duped at the C# layer) stacktrace. "aux_id" 0 is reserved
* to mean no aux stacktrace data. * to mean no aux stacktrace data.
*/ */
typedef void (*git_win32__stack__aux_cb_alloc)(unsigned int *aux_id); typedef void (*git_win32_leakcheck_stack_aux_cb_alloc)(unsigned int *aux_id);
/** /**
* This type defines a callback to be used to augment the output of * This type defines a callback to be used to augment the output of
...@@ -38,7 +46,7 @@ typedef void (*git_win32__stack__aux_cb_alloc)(unsigned int *aux_id); ...@@ -38,7 +46,7 @@ typedef void (*git_win32__stack__aux_cb_alloc)(unsigned int *aux_id);
* @param aux_msg A buffer where a formatted message should be written. * @param aux_msg A buffer where a formatted message should be written.
* @param aux_msg_len The size of the buffer. * @param aux_msg_len The size of the buffer.
*/ */
typedef void (*git_win32__stack__aux_cb_lookup)(unsigned int aux_id, char *aux_msg, size_t aux_msg_len); typedef void (*git_win32_leakcheck_stack_aux_cb_lookup)(unsigned int aux_id, char *aux_msg, size_t aux_msg_len);
/** /**
* Register an "aux" data provider to augment our C stacktrace data. * Register an "aux" data provider to augment our C stacktrace data.
...@@ -50,15 +58,15 @@ typedef void (*git_win32__stack__aux_cb_lookup)(unsigned int aux_id, char *aux_m ...@@ -50,15 +58,15 @@ typedef void (*git_win32__stack__aux_cb_lookup)(unsigned int aux_id, char *aux_m
* If you choose to use this feature, it should be registered during * If you choose to use this feature, it should be registered during
* initialization and not changed for the duration of the process. * initialization and not changed for the duration of the process.
*/ */
GIT_EXTERN(int) git_win32__stack__set_aux_cb( int git_win32_leakcheck_stack_set_aux_cb(
git_win32__stack__aux_cb_alloc cb_alloc, git_win32_leakcheck_stack_aux_cb_alloc cb_alloc,
git_win32__stack__aux_cb_lookup cb_lookup); git_win32_leakcheck_stack_aux_cb_lookup cb_lookup);
/** /**
* Maximum number of stackframes to record for a * Maximum number of stackframes to record for a
* single stacktrace. * single stacktrace.
*/ */
#define GIT_WIN32__STACK__MAX_FRAMES 30 #define GIT_WIN32_LEAKCHECK_STACK_MAX_FRAMES 30
/** /**
* Wrapper containing the raw unprocessed stackframe * Wrapper containing the raw unprocessed stackframe
...@@ -72,8 +80,8 @@ GIT_EXTERN(int) git_win32__stack__set_aux_cb( ...@@ -72,8 +80,8 @@ GIT_EXTERN(int) git_win32__stack__set_aux_cb(
typedef struct { typedef struct {
unsigned int aux_id; unsigned int aux_id;
unsigned int nr_frames; unsigned int nr_frames;
void *frames[GIT_WIN32__STACK__MAX_FRAMES]; void *frames[GIT_WIN32_LEAKCHECK_STACK_MAX_FRAMES];
} git_win32__stack__raw_data; } git_win32_leakcheck_stack_raw_data;
/** /**
...@@ -81,14 +89,14 @@ typedef struct { ...@@ -81,14 +89,14 @@ typedef struct {
* thread at startup (under a lock if there are other threads * thread at startup (under a lock if there are other threads
* active). * active).
*/ */
void git_win32__stack_init(void); void git_win32_leakcheck_stack_init(void);
/** /**
* Cleanup symbol table data. This should be done in the * Cleanup symbol table data. This should be done in the
* primary thead at shutdown (under a lock if there are other * primary thead at shutdown (under a lock if there are other
* threads active). * threads active).
*/ */
void git_win32__stack_cleanup(void); void git_win32_leakcheck_stack_cleanup(void);
/** /**
...@@ -98,16 +106,16 @@ void git_win32__stack_cleanup(void); ...@@ -98,16 +106,16 @@ void git_win32__stack_cleanup(void);
* begin with the caller of this routine. Pass 1 to begin * begin with the caller of this routine. Pass 1 to begin
* with its caller. And so on. * with its caller. And so on.
*/ */
int git_win32__stack_capture(git_win32__stack__raw_data *pdata, int skip); int git_win32_leakcheck_stack_capture(git_win32_leakcheck_stack_raw_data *pdata, int skip);
/** /**
* Compare 2 raw stacktraces with the usual -1,0,+1 result. * Compare 2 raw stacktraces with the usual -1,0,+1 result.
* This includes any "aux_id" values in the comparison, so that * This includes any "aux_id" values in the comparison, so that
* our de-dup is also "aux" context relative. * our de-dup is also "aux" context relative.
*/ */
int git_win32__stack_compare( int git_win32_leakcheck_stack_compare(
git_win32__stack__raw_data *d1, git_win32_leakcheck_stack_raw_data *d1,
git_win32__stack__raw_data *d2); git_win32_leakcheck_stack_raw_data *d2);
/** /**
* Format raw stacktrace data into buffer WITHOUT using any mallocs. * Format raw stacktrace data into buffer WITHOUT using any mallocs.
...@@ -115,9 +123,9 @@ int git_win32__stack_compare( ...@@ -115,9 +123,9 @@ int git_win32__stack_compare(
* @param prefix String written before each frame; defaults to "\t". * @param prefix String written before each frame; defaults to "\t".
* @param suffix String written after each frame; defaults to "\n". * @param suffix String written after each frame; defaults to "\n".
*/ */
int git_win32__stack_format( int git_win32_leakcheck_stack_format(
char *pbuf, size_t buf_len, char *pbuf, size_t buf_len,
const git_win32__stack__raw_data *pdata, const git_win32_leakcheck_stack_raw_data *pdata,
const char *prefix, const char *suffix); const char *prefix, const char *suffix);
/** /**
...@@ -131,10 +139,118 @@ int git_win32__stack_format( ...@@ -131,10 +139,118 @@ int git_win32__stack_format(
* @param prefix String written before each frame; defaults to "\t". * @param prefix String written before each frame; defaults to "\t".
* @param suffix String written after each frame; defaults to "\n". * @param suffix String written after each frame; defaults to "\n".
*/ */
int git_win32__stack( int git_win32_leakcheck_stack(
char * pbuf, size_t buf_len, char * pbuf, size_t buf_len,
int skip, int skip,
const char *prefix, const char *suffix); const char *prefix, const char *suffix);
#endif /* GIT_MSVC_CRTDBG */ /* Stack tracing */
/* MSVC CRTDBG memory leak reporting.
*
* We DO NOT use the "_CRTDBG_MAP_ALLOC" macro described in the MSVC
* documentation because all allocs/frees in libgit2 already go through
* the "git__" routines defined in this file. Simply using the normal
* reporting mechanism causes all leaks to be attributed to a routine
* here in util.h (ie, the actual call to calloc()) rather than the
* caller of git__calloc().
*
* Therefore, we declare a set of "git__crtdbg__" routines to replace
* the corresponding "git__" routines and re-define the "git__" symbols
* as macros. This allows us to get and report the file:line info of
* the real caller.
*
* We DO NOT replace the "git__free" routine because it needs to remain
* a function pointer because it is used as a function argument when
* setting up various structure "destructors".
*
* We also DO NOT use the "_CRTDBG_MAP_ALLOC" macro because it causes
* "free" to be remapped to "_free_dbg" and this causes problems for
* structures which define a field named "free".
*
* Finally, CRTDBG must be explicitly enabled and configured at program
* startup. See tests/main.c for an example.
*/
/**
* Initialize our memory leak tracking and de-dup data structures.
* This should ONLY be called by git_libgit2_init().
*/
void git_win32_leakcheck_stacktrace_init(void);
/**
* Shutdown our memory leak tracking and dump summary data.
* This should ONLY be called by git_libgit2_shutdown().
*
* We explicitly call _CrtDumpMemoryLeaks() during here so
* that we can compute summary data for the leaks. We print
* the stacktrace of each unique leak.
*
* This cleanup does not happen if the app calls exit()
* without calling the libgit2 shutdown code.
*
* This info we print here is independent of any automatic
* reporting during exit() caused by _CRTDBG_LEAK_CHECK_DF.
* Set it in your app if you also want traditional reporting.
*/
void git_win32_leakcheck_stacktrace_cleanup(void);
/**
* Checkpoint options.
*/
typedef enum git_win32_leakcheck_stacktrace_options {
/**
* Set checkpoint marker.
*/
GIT_WIN32_LEAKCHECK_STACKTRACE_SET_MARK = (1 << 0),
/**
* Dump leaks since last checkpoint marker.
* May not be combined with _LEAKS_TOTAL.
*
* Note that this may generate false positives for global TLS
* error state and other global caches that aren't cleaned up
* until the thread/process terminates. So when using this
* around a region of interest, also check the final (at exit)
* dump before digging into leaks reported here.
*/
GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_SINCE_MARK = (1 << 1),
/**
* Dump leaks since init. May not be combined
* with _LEAKS_SINCE_MARK.
*/
GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_TOTAL = (1 << 2),
/**
* Suppress printing during dumps.
* Just return leak count.
*/
GIT_WIN32_LEAKCHECK_STACKTRACE_QUIET = (1 << 3),
} git_win32_leakcheck_stacktrace_options;
/**
* Checkpoint memory state and/or dump unique stack traces of
* current memory leaks.
*
* @return number of unique leaks (relative to requested starting
* point) or error.
*/
int git_win32_leakcheck_stacktrace_dump(
git_win32_leakcheck_stacktrace_options opt,
const char *label);
/**
* Construct stacktrace and append it to the global buffer.
* Return pointer to start of this string. On any error or
* lack of buffer space, just return the given file buffer
* so it will behave as usual.
*
* This should ONLY be called by our internal memory allocations
* routines.
*/
const char *git_win32_leakcheck_stacktrace(int skip, const char *file);
#endif
#endif #endif
src/win32/w32_stack.c deleted 100644 → 0
/*
* Copyright (C) the libgit2 contributors. All rights reserved.
*
* This file is part of libgit2, distributed under the GNU GPL v2 with
* a Linking Exception. For full terms see the included COPYING file.
*/
#include "w32_stack.h"
#if defined(GIT_MSVC_CRTDBG)
#include "Windows.h"
#include "Dbghelp.h"
#include "win32/posix.h"
#include "hash.h"
static bool g_win32_stack_initialized = false;
static HANDLE g_win32_stack_process = INVALID_HANDLE_VALUE;
static git_win32__stack__aux_cb_alloc g_aux_cb_alloc = NULL;
static git_win32__stack__aux_cb_lookup g_aux_cb_lookup = NULL;
int git_win32__stack__set_aux_cb(
git_win32__stack__aux_cb_alloc cb_alloc,
git_win32__stack__aux_cb_lookup cb_lookup)
{
g_aux_cb_alloc = cb_alloc;
g_aux_cb_lookup = cb_lookup;
return 0;
}
void git_win32__stack_init(void)
{
if (!g_win32_stack_initialized) {
g_win32_stack_process = GetCurrentProcess();
SymSetOptions(SYMOPT_LOAD_LINES);
SymInitialize(g_win32_stack_process, NULL, TRUE);
g_win32_stack_initialized = true;
}
}
void git_win32__stack_cleanup(void)
{
if (g_win32_stack_initialized) {
SymCleanup(g_win32_stack_process);
g_win32_stack_process = INVALID_HANDLE_VALUE;
g_win32_stack_initialized = false;
}
}
int git_win32__stack_capture(git_win32__stack__raw_data *pdata, int skip)
{
if (!g_win32_stack_initialized) {
git_error_set(GIT_ERROR_INVALID, "git_win32_stack not initialized.");
return GIT_ERROR;
}
memset(pdata, 0, sizeof(*pdata));
pdata->nr_frames = RtlCaptureStackBackTrace(
skip+1, GIT_WIN32__STACK__MAX_FRAMES, pdata->frames, NULL);
/* If an "aux" data provider was registered, ask it to capture
* whatever data it needs and give us an "aux_id" to it so that
* we can refer to it later when reporting.
*/
if (g_aux_cb_alloc)
(g_aux_cb_alloc)(&pdata->aux_id);
return 0;
}
int git_win32__stack_compare(
git_win32__stack__raw_data *d1,
git_win32__stack__raw_data *d2)
{
return memcmp(d1, d2, sizeof(*d1));
}
int git_win32__stack_format(
char *pbuf, size_t buf_len,
const git_win32__stack__raw_data *pdata,
const char *prefix, const char *suffix)
{
#define MY_MAX_FILENAME 255
/* SYMBOL_INFO has char FileName[1] at the end. The docs say to
* to malloc it with extra space for your desired max filename.
*/
struct {
SYMBOL_INFO symbol;
char extra[MY_MAX_FILENAME + 1];
} s;
IMAGEHLP_LINE64 line;
size_t buf_used = 0;
unsigned int k;
char detail[MY_MAX_FILENAME * 2]; /* filename plus space for function name and formatting */
size_t detail_len;
if (!g_win32_stack_initialized) {
git_error_set(GIT_ERROR_INVALID, "git_win32_stack not initialized.");
return GIT_ERROR;
}
if (!prefix)
prefix = "\t";
if (!suffix)
suffix = "\n";
memset(pbuf, 0, buf_len);
memset(&s, 0, sizeof(s));
s.symbol.MaxNameLen = MY_MAX_FILENAME;
s.symbol.SizeOfStruct = sizeof(SYMBOL_INFO);
memset(&line, 0, sizeof(line));
line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
for (k=0; k < pdata->nr_frames; k++) {
DWORD64 frame_k = (DWORD64)pdata->frames[k];
DWORD dwUnused;
if (SymFromAddr(g_win32_stack_process, frame_k, 0, &s.symbol) &&
SymGetLineFromAddr64(g_win32_stack_process, frame_k, &dwUnused, &line)) {
const char *pslash;
const char *pfile;
pslash = strrchr(line.FileName, '\\');
pfile = ((pslash) ? (pslash+1) : line.FileName);
p_snprintf(detail, sizeof(detail), "%s%s:%d> %s%s",
prefix, pfile, line.LineNumber, s.symbol.Name, suffix);
} else {
/* This happens when we cross into another module.
* For example, in CLAR tests, this is typically
* the CRT startup code. Just print an unknown
* frame and continue.
*/
p_snprintf(detail, sizeof(detail), "%s??%s", prefix, suffix);
}
detail_len = strlen(detail);
if (buf_len < (buf_used + detail_len + 1)) {
/* we don't have room for this frame in the buffer, so just stop. */
break;
}
memcpy(&pbuf[buf_used], detail, detail_len);
buf_used += detail_len;
}
/* "aux_id" 0 is reserved to mean no aux data. This is needed to handle
* allocs that occur before the aux callbacks were registered.
*/
if (pdata->aux_id > 0) {
p_snprintf(detail, sizeof(detail), "%saux_id: %d%s",
prefix, pdata->aux_id, suffix);
detail_len = strlen(detail);
if ((buf_used + detail_len + 1) < buf_len) {
memcpy(&pbuf[buf_used], detail, detail_len);
buf_used += detail_len;
}
/* If an "aux" data provider is still registered, ask it to append its detailed
* data to the end of ours using the "aux_id" it gave us when this de-duped
* item was created.
*/
if (g_aux_cb_lookup)
(g_aux_cb_lookup)(pdata->aux_id, &pbuf[buf_used], (buf_len - buf_used - 1));
}
return GIT_OK;
}
int git_win32__stack(
char * pbuf, size_t buf_len,
int skip,
const char *prefix, const char *suffix)
{
git_win32__stack__raw_data data;
int error;
if ((error = git_win32__stack_capture(&data, skip)) < 0)
return error;
if ((error = git_win32__stack_format(pbuf, buf_len, &data, prefix, suffix)) < 0)
return error;
return 0;
}
#endif
tests/trace/windows/stacktrace.c
#include "clar_libgit2.h" #include "clar_libgit2.h"
#include "win32/w32_stack.h" #include "win32/w32_leakcheck.h"
#include "win32/w32_crtdbg_stacktrace.h"
#if defined(GIT_MSVC_CRTDBG) #if defined(GIT_MSVC_CRTDBG)
static void a(void) static void a(void)
{ {
char buf[10000]; char buf[10000];
cl_assert(git_win32__stack(buf, sizeof(buf), 0, NULL, NULL) == 0); cl_assert(git_win32_leakcheck_stack(buf, sizeof(buf), 0, NULL, NULL) == 0);
#if 0 #if 0
fprintf(stderr, "Stacktrace from [%s:%d]:\n%s\n", __FILE__, __LINE__, buf); fprintf(stderr, "Stacktrace from [%s:%d]:\n%s\n", __FILE__, __LINE__, buf);
...@@ -47,79 +46,79 @@ void test_trace_windows_stacktrace__leaks(void) ...@@ -47,79 +46,79 @@ void test_trace_windows_stacktrace__leaks(void)
/* remember outstanding leaks due to set setup /* remember outstanding leaks due to set setup
* and set mark/checkpoint. * and set mark/checkpoint.
*/ */
before = git_win32__crtdbg_stacktrace__dump( before = git_win32_leakcheck_stacktrace_dump(
GIT_WIN32__CRTDBG_STACKTRACE__QUIET | GIT_WIN32_LEAKCHECK_STACKTRACE_QUIET |
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL | GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_TOTAL |
GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK, GIT_WIN32_LEAKCHECK_STACKTRACE_SET_MARK,
NULL); NULL);
p1 = git__malloc(5); p1 = git__malloc(5);
leaks = git_win32__crtdbg_stacktrace__dump( leaks = git_win32_leakcheck_stacktrace_dump(
GIT_WIN32__CRTDBG_STACKTRACE__QUIET | GIT_WIN32_LEAKCHECK_STACKTRACE_QUIET |
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_SINCE_MARK,
"p1"); "p1");
cl_assert_equal_i(1, leaks); cl_assert_equal_i(1, leaks);
p2 = git__malloc(5); p2 = git__malloc(5);
leaks = git_win32__crtdbg_stacktrace__dump( leaks = git_win32_leakcheck_stacktrace_dump(
GIT_WIN32__CRTDBG_STACKTRACE__QUIET | GIT_WIN32_LEAKCHECK_STACKTRACE_QUIET |
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_SINCE_MARK,
"p1,p2"); "p1,p2");
cl_assert_equal_i(2, leaks); cl_assert_equal_i(2, leaks);
p3 = git__malloc(5); p3 = git__malloc(5);
leaks = git_win32__crtdbg_stacktrace__dump( leaks = git_win32_leakcheck_stacktrace_dump(
GIT_WIN32__CRTDBG_STACKTRACE__QUIET | GIT_WIN32_LEAKCHECK_STACKTRACE_QUIET |
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_SINCE_MARK,
"p1,p2,p3"); "p1,p2,p3");
cl_assert_equal_i(3, leaks); cl_assert_equal_i(3, leaks);
git__free(p2); git__free(p2);
leaks = git_win32__crtdbg_stacktrace__dump( leaks = git_win32_leakcheck_stacktrace_dump(
GIT_WIN32__CRTDBG_STACKTRACE__QUIET | GIT_WIN32_LEAKCHECK_STACKTRACE_QUIET |
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_SINCE_MARK,
"p1,p3"); "p1,p3");
cl_assert_equal_i(2, leaks); cl_assert_equal_i(2, leaks);
/* move the mark. only new leaks should appear afterwards */ /* move the mark. only new leaks should appear afterwards */
error = git_win32__crtdbg_stacktrace__dump( error = git_win32_leakcheck_stacktrace_dump(
GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK, GIT_WIN32_LEAKCHECK_STACKTRACE_SET_MARK,
NULL); NULL);
/* cannot use cl_git_pass() since that may allocate memory. */ /* cannot use cl_git_pass() since that may allocate memory. */
cl_assert_equal_i(0, error); cl_assert_equal_i(0, error);
leaks = git_win32__crtdbg_stacktrace__dump( leaks = git_win32_leakcheck_stacktrace_dump(
GIT_WIN32__CRTDBG_STACKTRACE__QUIET | GIT_WIN32_LEAKCHECK_STACKTRACE_QUIET |
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_SINCE_MARK,
"not_p1,not_p3"); "not_p1,not_p3");
cl_assert_equal_i(0, leaks); cl_assert_equal_i(0, leaks);
p4 = git__malloc(5); p4 = git__malloc(5);
leaks = git_win32__crtdbg_stacktrace__dump( leaks = git_win32_leakcheck_stacktrace_dump(
GIT_WIN32__CRTDBG_STACKTRACE__QUIET | GIT_WIN32_LEAKCHECK_STACKTRACE_QUIET |
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_SINCE_MARK,
"p4,not_p1,not_p3"); "p4,not_p1,not_p3");
cl_assert_equal_i(1, leaks); cl_assert_equal_i(1, leaks);
git__free(p1); git__free(p1);
git__free(p3); git__free(p3);
leaks = git_win32__crtdbg_stacktrace__dump( leaks = git_win32_leakcheck_stacktrace_dump(
GIT_WIN32__CRTDBG_STACKTRACE__QUIET | GIT_WIN32_LEAKCHECK_STACKTRACE_QUIET |
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_SINCE_MARK,
"p4"); "p4");
cl_assert_equal_i(1, leaks); cl_assert_equal_i(1, leaks);
git__free(p4); git__free(p4);
leaks = git_win32__crtdbg_stacktrace__dump( leaks = git_win32_leakcheck_stacktrace_dump(
GIT_WIN32__CRTDBG_STACKTRACE__QUIET | GIT_WIN32_LEAKCHECK_STACKTRACE_QUIET |
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_SINCE_MARK,
"end"); "end");
cl_assert_equal_i(0, leaks); cl_assert_equal_i(0, leaks);
/* confirm current absolute leaks count matches beginning value. */ /* confirm current absolute leaks count matches beginning value. */
after = git_win32__crtdbg_stacktrace__dump( after = git_win32_leakcheck_stacktrace_dump(
GIT_WIN32__CRTDBG_STACKTRACE__QUIET | GIT_WIN32_LEAKCHECK_STACKTRACE_QUIET |
GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL, GIT_WIN32_LEAKCHECK_STACKTRACE_LEAKS_TOTAL,
"total"); "total");
cl_assert_equal_i(before, after); cl_assert_equal_i(before, after);
#endif #endif
...@@ -143,11 +142,11 @@ static void aux_cb_lookup__1(unsigned int aux_id, char *aux_msg, size_t aux_msg_ ...@@ -143,11 +142,11 @@ static void aux_cb_lookup__1(unsigned int aux_id, char *aux_msg, size_t aux_msg_
void test_trace_windows_stacktrace__aux1(void) void test_trace_windows_stacktrace__aux1(void)
{ {
#if defined(GIT_MSVC_CRTDBG) #if defined(GIT_MSVC_CRTDBG)
git_win32__stack__set_aux_cb(aux_cb_alloc__1, aux_cb_lookup__1); git_win32_leakcheck_stack_set_aux_cb(aux_cb_alloc__1, aux_cb_lookup__1);
c(); c();
c(); c();
c(); c();
c(); c();
git_win32__stack__set_aux_cb(NULL, NULL); git_win32_leakcheck_stack_set_aux_cb(NULL, NULL);
#endif #endif
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment