Fix agent deadlock and remove braindead tags dependency

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

diff --git a/Makefile b/Makefile
index 3b6b4cb00a20fa12c7c93df98ea8d0bb85693fa4..538b0c343cf15e3110c5c0b8b4881ba4f3323232 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@ DEBUG=-g #-pg
 #endif
 
 # Optional debugging parameters
-DEBUG_THREADS = #-DDEBUG_THREADS #-DDO_CRASH #-DDETECT_DEADLOCKS
+DEBUG_THREADS = -DDEBUG_THREADS #-DDO_CRASH #-DDETECT_DEADLOCKS
 
 # Uncomment next one to enable ast_frame tracing (for debugging)
 TRACE_FRAMES = #-DTRACE_FRAMES
@@ -294,9 +294,9 @@ _all: all
 
 all: cleantest depend asterisk subdirs 
 
-ifneq ($(wildcard tags),)
-all: tags
-endif
+#ifneq ($(wildcard tags),)
+ctags: tags
+#endif
 
 ifneq ($(wildcard TAGS),)
 all: TAGS

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index a330764a19fdf44310d0a0366dfb52e0aed6beb1..f537cf4f89956b71c776a7978015931e809465a9 100755 (executable)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -705,14 +705,12 @@ static int agent_hangup(struct ast_channel *ast)
                                snprintf(agent, sizeof(agent), "Agent/%s", p->agent);
                                ast_queue_log("NONE", ast->uniqueid, agent, "AGENTCALLBACKLOGOFF", "%s|%ld|%s", p->loginchan, logintime, "Autologoff");
                                p->loginchan[0] = '\0';
-                           ast_device_state_changed("Agent/%s", p->agent);
                        }
                } else if (p->dead) {
                        ast_mutex_lock(&p->chan->lock);
                        ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT);
                        ast_mutex_unlock(&p->chan->lock);
                } else {
-                       ast_device_state_changed("Agent/%s", p->agent);
                        ast_mutex_lock(&p->chan->lock);
                        ast_moh_start(p->chan, p->moh);
                        ast_mutex_unlock(&p->chan->lock);
@@ -734,6 +732,7 @@ static int agent_hangup(struct ast_channel *ast)
        }
 #endif 
        ast_mutex_unlock(&p->lock);
+       ast_device_state_changed("Agent/%s", p->agent);
 
        if (p->pending) {
                ast_mutex_lock(&agentlock);