qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [4/4] qpid-proton git commit: PROTON-1460: make epoll the default proactor on linux
Date Mon, 08 May 2017 19:04:01 GMT
PROTON-1460: make epoll the default proactor on linux

The libuv proactor can still be selected with cmake -DPROACTOR=libuv,
and will be selected automatically on platforms without epoll.


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/e28859b9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/e28859b9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/e28859b9

Branch: refs/heads/master
Commit: e28859b9a9d6df49554f550a1a4fec047a66410e
Parents: 740a496
Author: Alan Conway <aconway@redhat.com>
Authored: Mon May 8 14:58:59 2017 -0400
Committer: Alan Conway <aconway@redhat.com>
Committed: Mon May 8 14:58:59 2017 -0400

----------------------------------------------------------------------
 proton-c/CMakeLists.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e28859b9/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 36e78f1..6c2211e 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -482,9 +482,7 @@ set (qpid-proton-include-extra
 set(PROACTOR "" CACHE STRING "Override default proactor, one of: epoll, libuv, none")
 string(TOLOWER "${PROACTOR}" PROACTOR)
 
-# FIXME aconway 2017-04-12: not enabling epoll by default, must use PROACTOR=epoll
-# When it is more stable, enable as default by uncommenting # OR (NOT PROACTOR...
-if (PROACTOR STREQUAL "epoll") # OR (NOT PROACTOR AND NOT PROACTOR_OK))
+if (PROACTOR STREQUAL "epoll" OR (NOT PROACTOR AND NOT BUILD_PROACTOR))
   check_symbol_exists(epoll_wait "sys/epoll.h" HAVE_EPOLL)
   if (HAVE_EPOLL)
     set (PROACTOR_OK epoll)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message