[asterisk-commits] lmadsen: tag 1.8.5.0 r327741 - in /tags/1.8.5.0: ./ res/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Mon Jul 11 15:59:32 2011
New Revision: 327741

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=327741
Log:
Update .version and ChangeLog.
Merge in res_timing_timerfd patch to revert change that causes issues with analog phones.

Removed:
    tags/1.8.5.0/asterisk-1.8.5-rc1-summary.html
    tags/1.8.5.0/asterisk-1.8.5-rc1-summary.txt
Modified:
    tags/1.8.5.0/.version
    tags/1.8.5.0/ChangeLog
    tags/1.8.5.0/res/res_timing_timerfd.c

Modified: tags/1.8.5.0/.version
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.5.0/.version?view=diff&rev=327741&r1=327740&r2=327741
==============================================================================
--- tags/1.8.5.0/.version (original)
+++ tags/1.8.5.0/.version Mon Jul 11 15:59:32 2011
@@ -1,1 +1,1 @@
-1.8.5-rc1
+1.8.5.0

Modified: tags/1.8.5.0/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.5.0/ChangeLog?view=diff&rev=327741&r1=327740&r2=327741
==============================================================================
--- tags/1.8.5.0/ChangeLog (original)
+++ tags/1.8.5.0/ChangeLog Mon Jul 11 15:59:32 2011
@@ -1,3 +1,17 @@
+2011-07-11  Leif Madsen <lmadsen at digium.com>
+
+	* Asterisk 1.8.5.0 Released.
+
+	* r326484 | dvossel | 2011-07-06 10:26:49 -0500 (Wed, 06 Jul 2011)
+
+	  Reverts fix for timerfd locking issue.
+
+	  jrose discovered a performance issue with this
+	  fix that prevents his analog phones from working
+	  when using timerfd as a timing source.  Until
+	  it is understood what is causing this performance
+	  problem, this patch is being reverted.
+
 2011-06-29  Leif Madsen <lmadsen at digium.com>
 
 	* Asterisk 1.8.5-rc1 Released.

Modified: tags/1.8.5.0/res/res_timing_timerfd.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.5.0/res/res_timing_timerfd.c?view=diff&rev=327741&r1=327740&r2=327741
==============================================================================
--- tags/1.8.5.0/res/res_timing_timerfd.c (original)
+++ tags/1.8.5.0/res/res_timing_timerfd.c Mon Jul 11 15:59:32 2011
@@ -162,35 +162,7 @@
 	uint64_t expirations;
 	int read_result = 0;
 
-	struct timerfd_timer *our_timer, find_helper = {
-		.handle = handle,
-	};
-
-	if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) {
-		ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle);
-		return;
-	}
-
-	if (our_timer->saved_timer.it_value.tv_nsec == 0L) {
-		ast_log(LOG_DEBUG, "Reading attempt on idle timerfd.\n");
-		return;
-	}
-
 	do {
-		struct itimerspec timer_status;
-
-		if (timerfd_gettime(handle, &timer_status)) {
-			ast_log(LOG_ERROR, "Call to timerfd_gettime() error: %s\n", strerror(errno));
-			expirations = 0;
-			break;
-		}
-
-		if ((timer_status.it_value.tv_sec == 0) && (timer_status.it_value.tv_nsec == 0)) {
-			ast_log(LOG_DEBUG, "Call to timerfd_timer_ack() with disarmed timer - break now.\n");
-			expirations = 0;
-			break;
-		}
-
 		read_result = read(handle, &expirations, sizeof(expirations));
 		if (read_result == -1) {
 			if (errno == EINTR || errno == EAGAIN) {