diff options
author | Richard Mudgett <rmudgett@digium.com> | 2014-03-24 23:36:36 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2014-03-24 23:36:36 +0000 |
commit | 89e12de79dce4266bba536e7f7290adf36a737f1 (patch) | |
tree | 79458695c7a43e36033ce22bdd4d038b8d4121ca | |
parent | 6d81951f0d32385842704b258b0bab500ce6f7be (diff) |
locking: Add temporary sanity checks.
Add some temporary sanity checks to hunt for locking problems with the
masquerade supertest.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411073 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | main/lock.c | 3 | ||||
-rw-r--r-- | utils/ael_main.c | 6 | ||||
-rw-r--r-- | utils/conf2ael.c | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/main/lock.c b/main/lock.c index d66e01b27..0af736f7d 100644 --- a/main/lock.c +++ b/main/lock.c @@ -311,6 +311,7 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func, } #endif /* DEBUG_THREADS */ + ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */ return res; } @@ -417,6 +418,7 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun __ast_mutex_logger("%s line %d (%s): Error: mutex '%s' is uninitialized and unable to initialize.\n", filename, lineno, func, mutex_name); } + ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */ return res; } #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ @@ -477,6 +479,7 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun } #endif /* DEBUG_THREADS */ + ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */ return res; } diff --git a/utils/ael_main.c b/utils/ael_main.c index b4245c8b4..96898e18f 100644 --- a/utils/ael_main.c +++ b/utils/ael_main.c @@ -37,6 +37,12 @@ void ast_register_file_version(const char *file, const char *version) { } void ast_unregister_file_version(const char *file) { } #endif +void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function); +void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function) +{ + /*! \todo BUGBUG Put here only to allow utils to compile in AST_DEVMODE */ +} + struct ast_flags ast_compat = { 7 }; /*** MODULEINFO diff --git a/utils/conf2ael.c b/utils/conf2ael.c index ef5225352..fe3c9f30f 100644 --- a/utils/conf2ael.c +++ b/utils/conf2ael.c @@ -80,6 +80,12 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */ int option_debug = 0; int option_verbose = 0; +void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function); +void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function) +{ + /*! \todo BUGBUG Put here only to allow utils to compile in AST_DEVMODE */ +} + void ast_register_file_version(const char *file, const char *version); void ast_register_file_version(const char *file, const char *version) { |