diff options
author | Mark Spencer <markster@digium.com> | 2004-11-02 21:56:01 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2004-11-02 21:56:01 +0000 |
commit | 9941b34dd8356fde826936d52453f6ad7fe132b5 (patch) | |
tree | c0502e9e731f0f02feffcd0065b52e06cd6e6ffb | |
parent | 5d93698d99738beb3b8ee4a53bf9ce3fec282899 (diff) |
Fix locking issues
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4148 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | pbx/pbx_dundi.c | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 8b583ef71..a9a295323 100755 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -3183,22 +3183,50 @@ static int dundi_query(struct dundi_transaction *trans) static int discover_transactions(struct dundi_request *dr) { struct dundi_transaction *trans; + ast_mutex_lock(&peerlock); trans = dr->trans; while(trans) { dundi_discover(trans); trans = trans->next; } + ast_mutex_unlock(&peerlock); return 0; } static int precache_transactions(struct dundi_request *dr, struct dundi_mapping *maps, int mapcount, int *expiration, int *foundanswers) { - struct dundi_transaction *trans; + struct dundi_transaction *trans, *transn; + /* Mark all as "in thread" so they don't disappear */ + ast_mutex_lock(&peerlock); trans = dr->trans; while(trans) { - precache_trans(trans, maps, mapcount, expiration, foundanswers); + if (trans->thread) + ast_log(LOG_WARNING, "This shouldn't happen, really...\n"); + trans->thread = 1; trans = trans->next; } + ast_mutex_unlock(&peerlock); + + trans = dr->trans; + while(trans) { + if (!(trans->flags & FLAG_DEAD)) + precache_trans(trans, maps, mapcount, expiration, foundanswers); + trans = trans->next; + } + + /* Cleanup any that got destroyed in the mean time */ + ast_mutex_lock(&peerlock); + trans = dr->trans; + while(trans) { + transn = trans->next; + trans->thread = 0; + if (trans->flags & FLAG_DEAD) { + ast_log(LOG_DEBUG, "Our transaction went away!\n"); + destroy_trans(trans, 0); + } + trans = transn; + } + ast_mutex_unlock(&peerlock); return 0; } |