kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scope Trace: Make it easier to trace through synchronous tasks

Browse Source 
Tracing through synchronous tasks was a little troublesome because
the new thread's stack counter reset to 0.  This change allows
a synchronous task to set its trace level to be the same as the
thread that pushed the task.  For now, the task's level has to be
passed in the task's data structure but a future enhancement to the
taskprocessor subsystem could automatically set the trace level
of the servant to be that of the caller.

This doesn't really make sense for async tasks because you never
know when they're going to run anyway.

Change-Id: Ib8049c0b815063a45d8c7b0cb4e30b7b87b1d825
This commit is contained in:
George Joseph
2020-07-05 17:51:04 -06:00
committed by Kevin Harwell
parent 7c12303c4c
commit bb1af1b6fc
2 changed files with 108 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
main/logger.c
View File

@@ -2287,9 +2287,36 @@ static void update_logchannels(void)
AST_THREADSTORAGE_RAW(trace_indent);
#define LOTS_O_SPACES " "
unsigned long _ast_trace_get_indent(void)
{
return (unsigned long)ast_threadstorage_get_ptr(&trace_indent);
}
void _ast_trace_set_indent(unsigned long indent)
{
ast_threadstorage_set_ptr(&trace_indent, (void*)indent);
}
unsigned long _ast_trace_inc_indent(void)
{
unsigned long indent = (unsigned long)ast_threadstorage_get_ptr(&trace_indent);
indent++;
ast_threadstorage_set_ptr(&trace_indent, (void*)indent);
return indent;
}
unsigned long _ast_trace_dec_indent(void)
{
unsigned long indent = (unsigned long)ast_threadstorage_get_ptr(&trace_indent);
indent--;
ast_threadstorage_set_ptr(&trace_indent, (void*)indent);
return indent;
}
void __ast_trace(const char *file, int line, const char *func, enum ast_trace_indent_type indent_type,
const char* format, ...)
unsigned long new_indent, const char* format, ...)
{
va_list ap;
unsigned long indent = (unsigned long)ast_threadstorage_get_ptr(&trace_indent);
@@ -2300,11 +2327,13 @@ void __ast_trace(const char *file, int line, const char *func, enum ast_trace_in
return;
}
if (indent_type == AST_TRACE_INDENT_INC_BEFORE) {
if (indent_type == AST_TRACE_INDENT_PROVIDED) {
indent = new_indent;
ast_threadstorage_set_ptr(&trace_indent, (void*)indent);
} else if (indent_type == AST_TRACE_INDENT_INC_BEFORE) {
indent++;
ast_threadstorage_set_ptr(&trace_indent, (void*)indent);
}
if (indent_type == AST_TRACE_INDENT_DEC_BEFORE) {
} else if (indent_type == AST_TRACE_INDENT_DEC_BEFORE) {
indent--;
ast_threadstorage_set_ptr(&trace_indent, (void*)indent);
}
@@ -2316,6 +2345,7 @@ void __ast_trace(const char *file, int line, const char *func, enum ast_trace_in
break;
case AST_TRACE_INDENT_INC_BEFORE:
case AST_TRACE_INDENT_INC_AFTER:
case AST_TRACE_INDENT_PROVIDED:
direction = "--> ";
break;
case AST_TRACE_INDENT_DEC_BEFORE:
@@ -2327,7 +2357,7 @@ void __ast_trace(const char *file, int line, const char *func, enum ast_trace_in
ast_str_set(&fmt, 0, "%2d %-.*s%s%s:%d %s: %s", (int)indent, (indent_type == AST_TRACE_INDENT_NONE ? 0 : (int)(indent * 4)),
LOTS_O_SPACES, direction, file, line, func, S_OR(ast_skip_blanks(format), "\n"));
if (indent_type == AST_TRACE_INDENT_INC_AFTER) {
if (indent_type == AST_TRACE_INDENT_INC_AFTER || indent_type == AST_TRACE_INDENT_PROVIDED) {
indent++;
ast_threadstorage_set_ptr(&trace_indent, (void*)indent);
}