[asterisk-commits] rmudgett: branch 1.6.2 r305342 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Jan 31 17:50:10 2011
New Revision: 305342

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305342
Log:
Merged revisions 305341 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r305341 | rmudgett | 2011-01-31 17:45:58 -0600 (Mon, 31 Jan 2011) | 7 lines
  
  Obtain the pri lock for PRI queue counters.
  
  Need to obtain the pri lock when calling pri_dump_info_str() to avoid a
  reentrancy problem when calculating the Q.921 Q count statistic.
  
  JIRA AST-484
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=305342&r1=305341&r2=305342
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Mon Jan 31 17:50:10 2011
@@ -14395,6 +14395,7 @@
 			ast_cli(a->fd, "%s D-channel: %d\n", pri_order(x), pris[span-1].dchannels[x]);
 			build_status(status, sizeof(status), pris[span-1].dchanavail[x], pris[span-1].dchans[x] == pris[span-1].pri);
 			ast_cli(a->fd, "Status: %s\n", status);
+			ast_mutex_lock(&pris[span - 1].lock);
 #ifdef PRI_DUMP_INFO_STR
 			info_str = pri_dump_info_str(pris[span-1].pri);
 			if (info_str) {
@@ -14404,6 +14405,7 @@
 #else
 			pri_dump_info(pris[span-1].pri);
 #endif
+			ast_mutex_unlock(&pris[span - 1].lock);
 			ast_cli(a->fd, "Overlap Recv: %s\n\n", (pris[span-1].overlapdial & DAHDI_OVERLAPDIAL_INCOMING)?"Yes":"No");
 		}
 	}