From f34b1869bdef8598d467f558909aa7b30be066a8 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 30 Oct 2008 00:54:37 +0000 Subject: [PATCH] Merged revisions 152689 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r152689 | tilghman | 2008-10-29 19:45:47 -0500 (Wed, 29 Oct 2008) | 2 lines Track down and fix annoying lock errors ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152690 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/main/pbx.c b/main/pbx.c index a54c26dcfc..fc75e0fbff 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3229,15 +3229,18 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con, } /*! \brief Find hint for given extension in context */ -static struct ast_exten *ast_hint_extension(struct ast_channel *c, const char *context, const char *exten) +static struct ast_exten *ast_hint_extension_nolock(struct ast_channel *c, const char *context, const char *exten) { - struct ast_exten *e; struct pbx_find_info q = { .stacklen = 0 }; /* the rest is set in pbx_find_context */ + return pbx_find_extension(c, NULL, &q, context, exten, PRIORITY_HINT, NULL, "", E_MATCH); +} +static struct ast_exten *ast_hint_extension(struct ast_channel *c, const char *context, const char *exten) +{ + struct ast_exten *e; ast_rdlock_contexts(); - e = pbx_find_extension(c, NULL, &q, context, exten, PRIORITY_HINT, NULL, "", E_MATCH); + e = ast_hint_extension_nolock(c, context, exten); ast_unlock_contexts(); - return e; } @@ -6033,7 +6036,8 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_ if (exten && exten->exten[0] == '_') { ast_add_extension(exten->parent->name, 0, this->exten, PRIORITY_HINT, NULL, 0, exten->app, ast_strdup(exten->data), ast_free_ptr, registrar); - exten = ast_hint_extension(NULL, this->context, this->exten); + /* rwlocks are not recursive locks */ + exten = ast_hint_extension_nolock(NULL, this->context, this->exten); } /* Find the hint in the list of hints */