diff options
| author | Mark Michelson <mmichelson@digium.com> | 2008-11-19 19:37:32 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2008-11-19 19:37:32 +0000 |
| commit | 0e5367f7eb4515077100839ed82cd27683235ac2 (patch) | |
| tree | 776ed3fe91e9a1fa35269d40568d1528bda8e481 /res/res_timing_dahdi.c | |
| parent | d66a8cd26481d94426cbbffef212f63d5c0da378 (diff) | |
Merge the changes from the res_timing_timerfd branch.
This provides a new timing interface. In order to use it,
you must be running a Linux with a kernel version of
2.6.25 or newer and glibc 2.8 or newer.
This timing interface is a good alternative if a timing
source is necessary (e.g. for IAX trunking) but DAHDI is
otherwise unnecessary for the system.
For now, this commit contains the actual work done in the
res_timing_timerfd branch. There are no notices in the README
or CHANGES files yet, but they will be added in my next commit.
The timing API of Asterisk also needs to have a bit of work done
with regards to choosing which timing interface to use. This commit
makes the choice a build-time decision, by only allowing one of
the timer interfaces to be chosen in menuselect. It would be preferable
if the choice could be made at run-time, however. The preferred timing
interface could be loaded and tested, and if it does not work, choice
number two may be used instead. That sort of thing. That is beyond
the scope of work in this branch though.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@157820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_timing_dahdi.c')
| -rw-r--r-- | res/res_timing_dahdi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_timing_dahdi.c b/res/res_timing_dahdi.c index 55791e678..1e1150bfe 100644 --- a/res/res_timing_dahdi.c +++ b/res/res_timing_dahdi.c @@ -25,6 +25,8 @@ /*** MODULEINFO <depend>dahdi</depend> + <conflict>res_timing_timerfd</conflict> + <conflict>res_timing_pthread</conflict> ***/ #include "asterisk.h" |