From: Arnaldo Pereira <arnaldo@sangoma.com>
Date: Wed, 1 Dec 2010 22:34:02 +0000 (-0200)
Subject: Merge branch 'master' into arnaldo.ftdm_channel_read_event
X-Git-Tag: v1.2-rc1~247^2^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dc8d5b09a8aefd19951f54ddbad153b3fb27877;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into arnaldo.ftdm_channel_read_event

Conflicts:

	libs/freetdm/src/ftdm_io.c
	libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
---

3dc8d5b09a8aefd19951f54ddbad153b3fb27877
diff --cc libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
index 17f0219b1f,0ac628a260..0fd2cd66be
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
@@@ -850,6 -856,17 +858,16 @@@ static void wanpipe_read_stats(ftdm_cha
  		ftdm_clear_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_FRAME);
  	}
  
+ 	if (ftdmchan->iostats.rx.queue_len >= (0.8 * ftdmchan->iostats.rx.queue_size)) {
+ 		ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Rx Queue length exceeded 80% threshold (%d/%d)\n",
+ 					  		ftdmchan->iostats.rx.queue_len, ftdmchan->iostats.rx.queue_size);
+ 		ftdm_set_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_QUEUE_THRES);
+ 	} else if (ftdm_test_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_QUEUE_THRES)){
 -		/* any reason we have wanpipe_tdm_api_iface.h in ftmod_wanpipe/ dir? */
+ 		ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Rx Queue length reduced 80% threshold (%d/%d)\n",
+ 					  		ftdmchan->iostats.rx.queue_len, ftdmchan->iostats.rx.queue_size);
+ 		ftdm_clear_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_QUEUE_THRES);
+ 	}
+ 	
  	if (ftdmchan->iostats.rx.queue_len >= ftdmchan->iostats.rx.queue_size) {
  		ftdm_log_chan(ftdmchan, FTDM_LOG_CRIT, "Rx Queue Full (%d/%d)\n",
  					  ftdmchan->iostats.rx.queue_len, ftdmchan->iostats.rx.queue_size);