Compare commits

...

19 Commits

Author SHA1 Message Date
Leif Madsen
5378a90107 Importing release summary for 1.8.5.0 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5.0@327742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-11 21:01:46 +00:00
Leif Madsen
3315dcb99d Update .version and ChangeLog.
Merge in res_timing_timerfd patch to revert change that causes issues with analog phones.

git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5.0@327741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-11 20:59:32 +00:00
Leif Madsen
48c4644740 Copy Asterisk 1.8.5-rc1 to 1.8.5.0 (note that we'll now use 4 octets all the time just to be consistent going forward).
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5.0@327740 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-11 20:51:45 +00:00
Leif Madsen
0fb60b6d39 Use autotagged externals
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@325721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 19:32:12 +00:00
Leif Madsen
4f39656906 Importing release summary for 1.8.5-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@325719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 19:32:08 +00:00
Leif Madsen
9a6cbaecbd Importing files for 1.8.5-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@325718 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 19:32:06 +00:00
Leif Madsen
68f4bf2501 Creating tag for the release of asterisk-1.8.5-rc1
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@325708 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 19:28:38 +00:00
Leif Madsen
bbc8a6f28e Use autotagged externals
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@325602 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 17:05:18 +00:00
Leif Madsen
e9308dbcf9 Importing release summary for 1.8.5-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@325601 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 17:05:15 +00:00
Leif Madsen
666e715c5d Importing files for 1.8.5-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@325600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 17:05:12 +00:00
Leif Madsen
833ca9b155 Creating tag for the release of asterisk-1.8.5-rc1
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@325598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 16:52:30 +00:00
Leif Madsen
c64775ab7e Use autotagged externals
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@324793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-24 17:19:40 +00:00
Leif Madsen
9588337ffe Importing release summary for 1.8.5-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@324792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-24 17:19:34 +00:00
Leif Madsen
52436c6ea7 Importing files for 1.8.5-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@324791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-24 17:19:31 +00:00
Leif Madsen
7e351892c4 Creating tag for the release of asterisk-1.8.5-rc1
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@324786 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-24 17:17:49 +00:00
Leif Madsen
1c9237c82a Use autotagged externals
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@324781 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-24 17:03:24 +00:00
Leif Madsen
49ab0d92d3 Importing release summary for 1.8.5-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@324780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-24 17:03:22 +00:00
Leif Madsen
d0d055574a Importing files for 1.8.5-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@324779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-24 17:03:19 +00:00
Leif Madsen
3276fbd7c8 Creating tag for the release of asterisk-1.8.5-rc1
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.5-rc1@324778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-24 17:01:58 +00:00
6 changed files with 35987 additions and 28 deletions

3
.lastclean Normal file
View File

@@ -0,0 +1,3 @@
39

1
.version Normal file
View File

@@ -0,0 +1 @@
1.8.5.0

32249
ChangeLog Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

2046
asterisk-1.8.5.0-summary.txt Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -162,35 +162,7 @@ static void timerfd_timer_ack(int handle, unsigned int quantity)
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) {