[asterisk-commits] russell: branch russell/chan_refcount r114265 - in /team/russell/chan_refcoun...

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Apr 18 13:27:04 2008
New Revision: 114265

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114265
Log:
get the branch compiling again

Modified:
    team/russell/chan_refcount/apps/app_chanspy.c
    team/russell/chan_refcount/channels/chan_gtalk.c
    team/russell/chan_refcount/channels/chan_iax2.c
    team/russell/chan_refcount/main/astobj2.c
    team/russell/chan_refcount/main/manager.c

Modified: team/russell/chan_refcount/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_chanspy.c?view=diff&rev=114265&r1=114264&r2=114265
==============================================================================
--- team/russell/chan_refcount/apps/app_chanspy.c (original)
+++ team/russell/chan_refcount/apps/app_chanspy.c Fri Apr 18 13:27:04 2008
@@ -572,7 +572,6 @@
 							res = ast_waitstream(chan, "");
 						}
 						if (res) {
-							chanspy_ds_free(peer_chanspy_ds);
 							break;
 						}
 					} else {
@@ -591,7 +590,6 @@
 				goto exit;
 			} else if (res == -2) {
 				res = 0;
-				chanspy_ds_free(peer_chanspy_ds);
 				goto exit;
 			} else if (res > 1 && spec) {
 				snprintf(nameprefix, AST_NAME_STRLEN, "%s/%d", spec, res);

Modified: team/russell/chan_refcount/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_gtalk.c?view=diff&rev=114265&r1=114264&r2=114265
==============================================================================
--- team/russell/chan_refcount/channels/chan_gtalk.c (original)
+++ team/russell/chan_refcount/channels/chan_gtalk.c Fri Apr 18 13:27:04 2008
@@ -1181,7 +1181,7 @@
 		gtalk_action(client, p, "reject");
 		p->alreadygone = 1;
 		gtalk_hangup(chan);
-		ast_channel_free(chan);
+		ast_channel_release(chan);
 		return -1;
 	}	
 

Modified: team/russell/chan_refcount/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_iax2.c?view=diff&rev=114265&r1=114264&r2=114265
==============================================================================
--- team/russell/chan_refcount/channels/chan_iax2.c (original)
+++ team/russell/chan_refcount/channels/chan_iax2.c Fri Apr 18 13:27:04 2008
@@ -3901,7 +3901,7 @@
 	ast_mutex_lock(&iaxsl[callno]);
 	if (!iaxs[callno]) {
 		if (tmp) {
-			ast_channel_free(tmp);
+			ast_channel_release(tmp);
 		}
 		ast_mutex_unlock(&iaxsl[callno]);
 		return NULL;

Modified: team/russell/chan_refcount/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/main/astobj2.c?view=diff&rev=114265&r1=114264&r2=114265
==============================================================================
--- team/russell/chan_refcount/main/astobj2.c (original)
+++ team/russell/chan_refcount/main/astobj2.c Fri Apr 18 13:27:04 2008
@@ -198,21 +198,6 @@
 #endif
 
 	return ast_mutex_unlock(&p->priv_data.lock);
-}
-
-int ao2_trylock(void *user_data)
-{
-	struct astobj2 *p = INTERNAL_OBJ(user_data);
-	int ret;
-	
-	if (p == NULL)
-		return -1;
-	ret =  ast_mutex_trylock(&p->priv_data.lock);
-#ifdef AO2_DEBUG
-	if (!ret)
-		ast_atomic_fetchadd_int(&ao2.total_locked, 1);
-#endif
-	return ret;
 }
 
 void *ao2_object_get_lockaddr(void *obj)

Modified: team/russell/chan_refcount/main/manager.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/main/manager.c?view=diff&rev=114265&r1=114264&r2=114265
==============================================================================
--- team/russell/chan_refcount/main/manager.c (original)
+++ team/russell/chan_refcount/main/manager.c Fri Apr 18 13:27:04 2008
@@ -2020,7 +2020,7 @@
 		return 0;
 	}
 
-	if (!(chan = ast_get_channel_by_name_locked(name))) {
+	if (!(chan = ast_channel_get_by_name(name))) {
 		astman_send_error(s, m, "Channel specified does not exist\n");
 		return 0;
 	}
@@ -2036,7 +2036,8 @@
 	}
 
 	astman_send_ack(s, m, "Atxfer successfully queued\n");
-	ast_channel_unlock(chan);
+
+	ast_channel_unref(chan);
 
 	return 0;
 }