[Asterisk-cvs] asterisk/channels chan_agent.c, 1.139, 1.140 chan_alsa.c, 1.44, 1.45 chan_features.c, 1.14, 1.15 chan_h323.c, 1.119, 1.120 chan_iax2.c, 1.312, 1.313 chan_local.c, 1.49, 1.50 chan_mgcp.c, 1.126, 1.127 chan_modem.c, 1.42, 1.43 chan_modem_aopen.c, 1.16, 1.17 chan_modem_bestdata.c, 1.17, 1.18 chan_modem_i4l.c, 1.28, 1.29 chan_nbs.c, 1.16, 1.17 chan_oss.c, 1.50, 1.51 chan_phone.c, 1.53, 1.54 chan_sip.c, 1.770, 1.771 chan_skinny.c, 1.82, 1.83 chan_vpb.c, 1.88, 1.89 chan_zap.c, 1.463, 1.464

kpfleming at lists.digium.com kpfleming at lists.digium.com
Thu Jun 23 22:14:32 CDT 2005


Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv24396/channels

Modified Files:
	chan_agent.c chan_alsa.c chan_features.c chan_h323.c 
	chan_iax2.c chan_local.c chan_mgcp.c chan_modem.c 
	chan_modem_aopen.c chan_modem_bestdata.c chan_modem_i4l.c 
	chan_nbs.c chan_oss.c chan_phone.c chan_sip.c chan_skinny.c 
	chan_vpb.c chan_zap.c 
Log Message:
don't use locks when reading usecounts (reading only, not writing)


Index: chan_agent.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_agent.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- chan_agent.c	18 Jun 2005 16:38:48 -0000	1.139
+++ chan_agent.c	24 Jun 2005 02:15:04 -0000	1.140
@@ -2225,11 +2225,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *key()

Index: chan_alsa.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- chan_alsa.c	6 Jun 2005 22:12:18 -0000	1.44
+++ chan_alsa.c	24 Jun 2005 02:15:04 -0000	1.45
@@ -1102,11 +1102,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *key()

Index: chan_features.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_features.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- chan_features.c	7 Jun 2005 17:06:33 -0000	1.14
+++ chan_features.c	24 Jun 2005 02:15:04 -0000	1.15
@@ -570,11 +570,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *key()

Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- chan_h323.c	6 Jun 2005 23:12:05 -0000	1.119
+++ chan_h323.c	24 Jun 2005 02:15:04 -0000	1.120
@@ -2420,11 +2420,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *description()

Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- chan_iax2.c	24 Jun 2005 01:37:15 -0000	1.312
+++ chan_iax2.c	24 Jun 2005 02:15:04 -0000	1.313
@@ -9327,11 +9327,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *key()

Index: chan_local.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_local.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- chan_local.c	7 Jun 2005 17:06:33 -0000	1.49
+++ chan_local.c	24 Jun 2005 02:15:04 -0000	1.50
@@ -585,11 +585,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *key()

Index: chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- chan_mgcp.c	9 Jun 2005 20:43:54 -0000	1.126
+++ chan_mgcp.c	24 Jun 2005 02:15:04 -0000	1.127
@@ -4383,11 +4383,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *key()

Index: chan_modem.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_modem.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- chan_modem.c	7 Jun 2005 17:06:33 -0000	1.42
+++ chan_modem.c	24 Jun 2005 02:15:04 -0000	1.43
@@ -1085,11 +1085,7 @@
 
 int usecount(void)
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *description()

Index: chan_modem_aopen.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_modem_aopen.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- chan_modem_aopen.c	6 Jun 2005 22:12:19 -0000	1.16
+++ chan_modem_aopen.c	24 Jun 2005 02:15:04 -0000	1.17
@@ -465,11 +465,7 @@
 
 int usecount(void)
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 int load_module(void)

Index: chan_modem_bestdata.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_modem_bestdata.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- chan_modem_bestdata.c	6 Jun 2005 22:12:19 -0000	1.17
+++ chan_modem_bestdata.c	24 Jun 2005 02:15:04 -0000	1.18
@@ -577,11 +577,7 @@
 
 int usecount(void)
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 int load_module(void)

Index: chan_modem_i4l.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_modem_i4l.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- chan_modem_i4l.c	6 Jun 2005 22:12:19 -0000	1.28
+++ chan_modem_i4l.c	24 Jun 2005 02:15:04 -0000	1.29
@@ -706,11 +706,7 @@
 
 int usecount(void)
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 int load_module(void)

Index: chan_nbs.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_nbs.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- chan_nbs.c	6 Jun 2005 23:12:05 -0000	1.16
+++ chan_nbs.c	24 Jun 2005 02:15:04 -0000	1.17
@@ -296,11 +296,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *description()

Index: chan_oss.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_oss.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- chan_oss.c	6 Jun 2005 22:12:19 -0000	1.50
+++ chan_oss.c	24 Jun 2005 02:15:04 -0000	1.51
@@ -1111,11 +1111,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *key()

Index: chan_phone.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_phone.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- chan_phone.c	6 Jun 2005 22:12:19 -0000	1.53
+++ chan_phone.c	24 Jun 2005 02:15:04 -0000	1.54
@@ -1392,11 +1392,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *description()

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -d -r1.770 -r1.771
--- chan_sip.c	22 Jun 2005 21:10:02 -0000	1.770
+++ chan_sip.c	24 Jun 2005 02:15:04 -0000	1.771
@@ -11598,13 +11598,7 @@
 
 int usecount()
 {
-	int res;
-
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-
-	return res;
+	return usecnt;
 }
 
 char *key()

Index: chan_skinny.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- chan_skinny.c	21 Jun 2005 23:06:44 -0000	1.82
+++ chan_skinny.c	24 Jun 2005 02:15:04 -0000	1.83
@@ -3392,11 +3392,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *key()

Index: chan_vpb.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_vpb.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- chan_vpb.c	22 Jun 2005 23:54:47 -0000	1.88
+++ chan_vpb.c	24 Jun 2005 02:15:04 -0000	1.89
@@ -2962,11 +2962,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *description()

Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -d -r1.463 -r1.464
--- chan_zap.c	23 Jun 2005 14:51:52 -0000	1.463
+++ chan_zap.c	24 Jun 2005 02:15:04 -0000	1.464
@@ -10645,11 +10645,7 @@
 
 int usecount()
 {
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
+	return usecnt;
 }
 
 char *description()




More information about the svn-commits mailing list