mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

optionally skip initial frames in backtrace

Browse source
This commit is contained in:
Lennart Poettering 2009-03-25 03:14:00 +01:00
parent 8460fac285
commit f6a6d01354
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/pulsecore/log.c
View file

@ -59,12 +59,13 @@
#define ENV_LOG_PRINT_META "PULSE_LOG_META" #define ENV_LOG_PRINT_META "PULSE_LOG_META"
#define ENV_LOG_PRINT_LEVEL "PULSE_LOG_LEVEL" #define ENV_LOG_PRINT_LEVEL "PULSE_LOG_LEVEL"
#define ENV_LOG_BACKTRACE "PULSE_LOG_BACKTRACE" #define ENV_LOG_BACKTRACE "PULSE_LOG_BACKTRACE"
#define ENV_LOG_BACKTRACE_SKIP "PULSE_LOG_BACKTRACE_SKIP"
static char *ident = NULL; /* in local charset format */ static char *ident = NULL; /* in local charset format */
static pa_log_target_t target = PA_LOG_STDERR, target_override; static pa_log_target_t target = PA_LOG_STDERR, target_override;
static pa_bool_t target_override_set = FALSE; static pa_bool_t target_override_set = FALSE;
static pa_log_level_t maximum_level = PA_LOG_ERROR, maximum_level_override = PA_LOG_ERROR; static pa_log_level_t maximum_level = PA_LOG_ERROR, maximum_level_override = PA_LOG_ERROR;
static unsigned show_backtrace = 0, show_backtrace_override = 0; static unsigned show_backtrace = 0, show_backtrace_override = 0, skip_backtrace = 0;
static pa_log_flags_t flags = 0, flags_override = 0; static pa_log_flags_t flags = 0, flags_override = 0;
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
@ -128,13 +129,17 @@ void pa_log_set_show_backtrace(unsigned nlevels) {
show_backtrace = nlevels; show_backtrace = nlevels;
} }
void pa_log_set_skip_backtrace(unsigned nlevels) {
skip_backtrace = nlevels;
}
#ifdef HAVE_EXECINFO_H #ifdef HAVE_EXECINFO_H
static char* get_backtrace(unsigned show_nframes) { static char* get_backtrace(unsigned show_nframes) {
void* trace[32]; void* trace[32];
int n_frames; int n_frames;
char **symbols, *e, *r; char **symbols, *e, *r;
unsigned j, n; unsigned j, n, s;
size_t a; size_t a;
pa_assert(show_nframes > 0); pa_assert(show_nframes > 0);
@ -149,12 +154,13 @@ static char* get_backtrace(unsigned show_nframes) {
if (!symbols) if (!symbols)
return NULL; return NULL;
n = PA_MIN((unsigned) n_frames, show_nframes); s = skip_backtrace;
n = PA_MIN((unsigned) n_frames, s + show_nframes);
a = 4; a = 4;
for (j = 0; j < n; j++) { for (j = s; j < n; j++) {
if (j > 0) if (j > s)
a += 2; a += 2;
a += strlen(pa_path_get_filename(symbols[j])); a += strlen(pa_path_get_filename(symbols[j]));
} }
@ -164,10 +170,10 @@ static char* get_backtrace(unsigned show_nframes) {
strcpy(r, " ("); strcpy(r, " (");
e = r + 2; e = r + 2;
for (j = 0; j < n; j++) { for (j = s; j < n; j++) {
const char *sym; const char *sym;
if (j > 0) { if (j > s) {
strcpy(e, "<<"); strcpy(e, "<<");
e += 2; e += 2;
} }
@ -229,6 +235,13 @@ static void init_defaults(void) {
if (show_backtrace_override <= 0) if (show_backtrace_override <= 0)
show_backtrace_override = 0; show_backtrace_override = 0;
} }
if ((e = getenv(ENV_LOG_BACKTRACE_SKIP))) {
skip_backtrace = (unsigned) atoi(e);
if (skip_backtrace <= 0)
skip_backtrace = 0;
}
} }
void pa_log_levelv_meta( void pa_log_levelv_meta(

3
src/pulsecore/log.h
View file

@ -77,6 +77,9 @@ void pa_log_set_flags(pa_log_flags_t flags, pa_log_merge_t merge);
/* Enable backtrace */ /* Enable backtrace */
void pa_log_set_show_backtrace(unsigned nlevels); void pa_log_set_show_backtrace(unsigned nlevels);
/* Skip the first backtrace frames */
void pa_log_set_skip_backtrace(unsigned nlevels);
void pa_log_level_meta( void pa_log_level_meta(
pa_log_level_t level, pa_log_level_t level,
const char*file, const char*file,