Only allow one 'dialplan reload' to execute at a time as otherwise they would share...
authorJoshua Colp <jcolp@digium.com>
Mon, 13 Feb 2012 19:56:02 +0000 (19:56 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 13 Feb 2012 19:56:02 +0000 (19:56 +0000)
(closes issue AST-758)
........

Merged revisions 355009 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 355010 from http://svn.asterisk.org/svn/asterisk/branches/10

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@355011 65c4cc65-6c06-0410-ace0-fbb531ad65f3

pbx/pbx_config.c

index 94b86d4..4aeabe9 100644 (file)
@@ -55,6 +55,8 @@ static char *overrideswitch_config = NULL;
 
 AST_MUTEX_DEFINE_STATIC(save_dialplan_lock);
 
+AST_MUTEX_DEFINE_STATIC(reload_lock);
+
 static struct ast_context *local_contexts = NULL;
 static struct ast_hashtab *local_table = NULL;
 /*
@@ -1776,11 +1778,15 @@ static int pbx_load_module(void)
 {
        struct ast_context *con;
 
+       ast_mutex_lock(&reload_lock);
+
        if (!local_table)
                local_table = ast_hashtab_create(17, ast_hashtab_compare_contexts, ast_hashtab_resize_java, ast_hashtab_newsize_java, ast_hashtab_hash_contexts, 0);
 
-       if (!pbx_load_config(config))
+       if (!pbx_load_config(config)) {
+               ast_mutex_unlock(&reload_lock);
                return AST_MODULE_LOAD_DECLINE;
+       }
        
        pbx_load_users();
 
@@ -1788,6 +1794,8 @@ static int pbx_load_module(void)
        local_table = NULL; /* the local table has been moved into the global one. */
        local_contexts = NULL;
 
+       ast_mutex_unlock(&reload_lock);
+
        for (con = NULL; (con = ast_walk_contexts(con));)
                ast_context_verify_includes(con);