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/astobj2.c | |
| 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/astobj2.c')
| -rw-r--r-- | main/astobj2.c | 3 |
1 files changed, 3 insertions, 0 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; /*! |