[asterisk-commits] jpeeler: branch jpeeler/bug12269 r168501 - /team/jpeeler/bug12269/channels/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Mon Jan 12 12:03:28 2009
New Revision: 168501

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168501
Log:
remove debugging statements

Modified:
    team/jpeeler/bug12269/channels/chan_agent.c

Modified: team/jpeeler/bug12269/channels/chan_agent.c
URL: http://svn.digium.com/svn-view/asterisk/team/jpeeler/bug12269/channels/chan_agent.c?view=diff&rev=168501&r1=168500&r2=168501
==============================================================================
--- team/jpeeler/bug12269/channels/chan_agent.c (original)
+++ team/jpeeler/bug12269/channels/chan_agent.c Mon Jan 12 12:03:28 2009
@@ -1089,7 +1089,6 @@
 	p->app_sleep_cond = 0;
 
 	alreadylocked = p->app_lock_flag;
-	ast_log(LOG_WARNING, "jpeeler alreadylocked: %d\n", alreadylocked);
 	p->app_lock_flag = 1;
 
 	if(ast_strlen_zero(p->loginchan) && alreadylocked) {
@@ -1124,13 +1123,6 @@
 	} 
 	if (p->chan)
 		ast_indicate(p->chan, AST_CONTROL_UNHOLD);
-	/* After the above step, there should not be any blockers. */
-	/* jpeeler: this does not seem to matter, as there are always going to be blockers now
-	if (p->chan && ast_test_flag(p->chan, AST_FLAG_BLOCKING)) {
-		ast_log(LOG_ERROR, "A blocker (%p) exists on %s after agent channel ownership acquired\n",(void *) p->chan->blocker, p->chan->name);
-		ast_assert(ast_test_flag(p->chan, AST_FLAG_BLOCKING) == 0);
-	}
-	*/
 	return tmp;
 }
 
@@ -2019,7 +2011,6 @@
 		else
 			res = ast_app_getdata(chan, "agent-user", user, sizeof(user) - 1, 0);
 	}
-ast_log(LOG_NOTICE, "jpeeler: res = %d\n", res);
 	while (!res && (max_login_tries==0 || tries < max_login_tries)) {
 		tries++;
 		/* Check for password */
@@ -2239,7 +2230,6 @@
 						ast_mutex_unlock(&p->lock);
 						AST_LIST_UNLOCK(&agents);
 						ast_device_state_changed("Agent/%s", p->agent);
-ast_log(LOG_NOTICE, "jpeeler: res = %d\n", res);
 						while (res >= 0) {
 							ast_mutex_lock(&p->lock);
 							if (p->deferlogoff && p->chan) {
@@ -2271,14 +2261,11 @@
 							ast_mutex_unlock(&p->lock);
 							AST_LIST_UNLOCK(&agents);
 							/*	Synchronize channel ownership between call to agent and itself. */
-//ast_log(LOG_NOTICE, "jpeeler: waiting for app_lock (app_lock_flag=%d)\n", p->app_lock_flag);
 							ast_mutex_lock(&p->app_lock);
-//ast_log(LOG_NOTICE, "jpeeler: app_lock obtained by thread %p\n", (void *) pthread_self());
 							if (p->app_lock_flag == 1) {
 								ast_cond_wait(&p->app_complete_cond, &p->app_lock);
 							}
 							ast_mutex_unlock(&p->app_lock);
-//ast_log(LOG_NOTICE, "jpeeler: app_lock released by thread %p\n", (void *) pthread_self());
 							ast_mutex_lock(&p->lock);
 							ast_mutex_unlock(&p->lock);
 							if (p->ackcall > 1)