Changeset 5247

Timestamp:

Feb 25, 2016 4:54:17 AM (9 years ago)

Author:

nanang

Message:

Misc (re #1882): Updated ioqueue epoll related vars in build config, e.g: update 'ac_linux_poll' value, introduce PJ_HAS_LINUX_EPOLL flag (thanks George Joseph for the patch).

Location:

pjproject/trunk

Files:

• README.txt (modified) (1 diff)
• aconfigure (modified) (5 diffs)
• aconfigure.ac (modified) (3 diffs)
• pjlib/include/pj/compat/os_auto.h.in (modified) (1 diff)

pjproject/trunk/README.txt

@@ -464 +464 @@
    ...
    Optional Features:
+   --enable-epoll           Use epoll on Linux instead of select
    --disable-floating-point     Disable floating point where possible
    --disable-sound              Exclude sound (i.e. use null sound)

pjproject/trunk/aconfigure

@@ -623 +623 @@
 ac_main_obj
 ac_host
-ac_linux_poll
 opus_present
 opus_h_present
@@ -689 +688 @@
 ac_external_speex
 ac_shared_libraries
+ac_linux_poll
 ac_os_objs
 EGREP
@@ -5682 +5682 @@
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking ioqueue backend" >&5
 $as_echo_n "checking ioqueue backend... " >&6; }
@@ -5690 +5691 @@
                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: /dev/epoll" >&5
 $as_echo "/dev/epoll" >&6; }
+                $as_echo "#define PJ_HAS_LINUX_EPOLL 1" >>confdefs.h
+
+                ac_linux_poll=epoll
 
 else
 
                 ac_os_objs=ioqueue_select.o
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: select()" >&5
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: select()" >&5
 $as_echo "select()" >&6; }
+                ac_linux_poll=select
 
 fi
@@ -8412 +8417 @@
 
 
-
-ac_linux_poll=select
 
 ac_host=unix

pjproject/trunk/aconfigure.ac

@@ -411 +411 @@
 dnl # 
 AC_SUBST(ac_os_objs)
+AC_SUBST(ac_linux_poll)
 AC_MSG_CHECKING([ioqueue backend])
 AC_ARG_ENABLE(epoll,
@@ -418 +419 @@
                 ac_os_objs=ioqueue_epoll.o
                 AC_MSG_RESULT([/dev/epoll])
+                AC_DEFINE(PJ_HAS_LINUX_EPOLL,1)
+                ac_linux_poll=epoll
               ],
               [
                 ac_os_objs=ioqueue_select.o
-                AC_MSG_RESULT([select()]) 
+                AC_MSG_RESULT([select()])
+                ac_linux_poll=select
               ])
 
@@ -1880 +1884 @@
 
 AC_SUBST(target)
-AC_SUBST(ac_linux_poll,select)
 AC_SUBST(ac_host,unix)
 AC_SUBST(ac_main_obj)

pjproject/trunk/pjlib/include/pj/compat/os_auto.h.in

@@ -129 +129 @@
 #undef PJ_SELECT_NEEDS_NFDS
 
+/* Was Linux epoll support enabled */
+#undef PJ_HAS_LINUX_EPOLL
+
 /* Is errno a good way to retrieve OS errors?
  */