mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-30 10:33:13 +00:00
Fix lock ordering in devicestate
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6069 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -184,13 +184,15 @@ int ast_device_state_changed(const char *fmt, ...)
|
|||||||
AST_LIST_LOCK(&state_changes);
|
AST_LIST_LOCK(&state_changes);
|
||||||
AST_LIST_INSERT_TAIL(&state_changes, change, list);
|
AST_LIST_INSERT_TAIL(&state_changes, change, list);
|
||||||
if (AST_LIST_FIRST(&state_changes) == change) {
|
if (AST_LIST_FIRST(&state_changes) == change) {
|
||||||
|
AST_LIST_UNLOCK(&state_changes);
|
||||||
/* the list was empty, signal the thread */
|
/* the list was empty, signal the thread */
|
||||||
ast_mutex_lock(&change_pending_lock);
|
ast_mutex_lock(&change_pending_lock);
|
||||||
pthread_cond_signal(&change_pending);
|
pthread_cond_signal(&change_pending);
|
||||||
ast_mutex_unlock(&change_pending_lock);
|
ast_mutex_unlock(&change_pending_lock);
|
||||||
}
|
} else {
|
||||||
AST_LIST_UNLOCK(&state_changes);
|
AST_LIST_UNLOCK(&state_changes);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user