diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-05-13 05:37:31 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-05-13 05:37:31 +0000 |
commit | 8d6ee962c7644fdfc47f56b8df7ed570435c8a27 (patch) | |
tree | 9d4eb039249b19afa0243f1406142d0958f96481 /Makefile | |
parent | 7d53dc86d6c120b1846ff06cec2b7c4dcc2a723b (diff) |
Add kqueue(2) implementation to Asterisk in various places.
This will save a considerable amount of CPU on the BSDs, including Mac OS X,
as it eliminates several places in the code that we previously used a busy
loop. Additionally, this adds a res_timing interface, using kqueue timers.
Review: https://reviewboard.asterisk.org/r/543/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@262852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -158,6 +158,9 @@ else ASTVARLIBDIR=$(localstatedir)/lib/asterisk ASTDBDIR=$(ASTVARLIBDIR) endif +ifneq ($(findstring darwin,$(OSARCH)),) + ASTVARRUNDIR=/Library/Application Support/Asterisk/Run +endif ASTKEYDIR=$(ASTVARLIBDIR) endif ifeq ($(ASTDATADIR),) @@ -559,7 +562,7 @@ installdirs: mkdir -p $(DESTDIR)$(ASTSBINDIR) mkdir -p $(DESTDIR)$(ASTETCDIR) mkdir -p $(DESTDIR)$(ASTBINDIR) - mkdir -p $(DESTDIR)$(ASTVARRUNDIR) + mkdir -p "$(DESTDIR)$(ASTVARRUNDIR)" mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system @@ -572,7 +575,7 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ + if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk -a ! -f /sbin/launchd ]; then \ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ fi |