diff options
author | Corey Farrell <git@cfware.com> | 2015-03-27 07:09:26 +0000 |
---|---|---|
committer | Corey Farrell <git@cfware.com> | 2015-03-27 07:09:26 +0000 |
commit | d01706ce1ee518118456d5673f529204bdac73bb (patch) | |
tree | 426f775451dc84e5e7b65d8a57d0b2be1fcbd378 /main | |
parent | 4b225e210485fa41b8cf00f6955a22101ff7ef6b (diff) |
Improved and portable ast_log recursion avoidance
This introduces a new logger routine ast_log_safe. This routine should be
used for all error messages in code that can be run as a result of ast_log.
ast_log_safe does nothing if run recursively. All error logging in
astobj2.c, strings.c and utils.h have been switched to ast_log_safe.
This required adding support for raw threadstorage. This provides direct
access to the void* pointer in threadstorage. In ast_log_safe, NULL is used
to signify that this thread is not already running ast_log_safe, (void*)1 when
it is already running. This was done since it's critical that ast_log_safe
do nothing that could log during recursion checking.
ASTERISK-24155 #close
Reported by: Timo Teräs
Review: https://reviewboard.asterisk.org/r/4502/
........
Merged revisions 433522 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433523 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/astobj2.c | 3 | ||||
-rw-r--r-- | main/hashtab.c | 4 | ||||
-rw-r--r-- | main/logger.c | 31 | ||||
-rw-r--r-- | main/strings.c | 5 |
4 files changed, 35 insertions, 8 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index 4ee1734da..f1d500174 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -36,6 +36,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/cli.h" #include "asterisk/paths.h" +/* Use ast_log_safe in place of ast_log. */ +#define ast_log ast_log_safe + static FILE *ref_log; /*! diff --git a/main/hashtab.c b/main/hashtab.c index d6cd7aa6d..4b765979f 100644 --- a/main/hashtab.c +++ b/main/hashtab.c @@ -43,10 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/hashtab.h" -#ifndef __AST_DEBUG_MALLOC -void *_ast_mem_backtrace_buffer[_AST_MEM_BACKTRACE_BUFLEN]; -#endif - #if (defined(MALLOC_DEBUG) && !defined(STANDALONE)) static void _ast_hashtab_resize(struct ast_hashtab *tab, const char *file, int lineno, const char *func); #define ast_hashtab_resize(a) _ast_hashtab_resize(a,__FILE__, __LINE__, __PRETTY_FUNCTION__) diff --git a/main/logger.c b/main/logger.c index 8ab75876c..183e75d08 100644 --- a/main/logger.c +++ b/main/logger.c @@ -107,6 +107,7 @@ static struct { } logfiles = { 1 }; static char hostname[MAXHOSTNAMELEN]; +AST_THREADSTORAGE_RAW(in_safe_log); enum logtypes { LOGTYPE_SYSLOG, @@ -1766,6 +1767,36 @@ void ast_log(int level, const char *file, int line, const char *function, const } } +void ast_log_safe(int level, const char *file, int line, const char *function, const char *fmt, ...) +{ + va_list ap; + void *recursed = ast_threadstorage_get_ptr(&in_safe_log); + struct ast_callid *callid; + + if (recursed) { + return; + } + + if (ast_threadstorage_set_ptr(&in_safe_log, (void*)1)) { + /* We've failed to set the flag that protects against + * recursion, so bail. */ + return; + } + + callid = ast_read_threadstorage_callid(); + + va_start(ap, fmt); + ast_log_full(level, file, line, function, callid, fmt, ap); + va_end(ap); + + if (callid) { + ast_callid_unref(callid); + } + + /* Clear flag so the next allocation failure can be logged. */ + ast_threadstorage_set_ptr(&in_safe_log, NULL); +} + void ast_log_callid(int level, const char *file, int line, const char *function, struct ast_callid *callid, const char *fmt, ...) { va_list ap; diff --git a/main/strings.c b/main/strings.c index 73892eb0a..b6b9fbcd7 100644 --- a/main/strings.c +++ b/main/strings.c @@ -87,9 +87,6 @@ int __ast_str_helper(struct ast_str **buf, ssize_t max_len, } else if (max_len == 0) { /* if unbounded, give more room for next time */ need += 16 + need / 4; } - if (0) { /* debugging */ - ast_verbose("extend from %d to %d\n", len, need); - } if ( #if (defined(MALLOC_DEBUG) && !defined(STANDALONE)) _ast_str_make_space(buf, need, file, lineno, function) @@ -97,7 +94,7 @@ int __ast_str_helper(struct ast_str **buf, ssize_t max_len, ast_str_make_space(buf, need) #endif ) { - ast_verbose("failed to extend from %d to %d\n", len, need); + ast_log_safe(LOG_VERBOSE, "failed to extend from %d to %d\n", len, need); va_end(aq); return AST_DYNSTR_BUILD_FAILED; } |