You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/07/03 00:01:37 UTC

[2/4] mesos git commit: Disable 'epoll' in libevent implementation.

Disable 'epoll' in libevent implementation.

There are currently issues when using 'epoll' with ssl support. We can
re-enable this when these are resolved.

Review: https://reviews.apache.org/r/36147


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

Branch: refs/heads/master
Commit: b9da875292270482d804056d0f4b64872e25911c
Parents: 0cf9204
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Thu Jul 2 14:55:17 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Thu Jul 2 14:57:19 2015 -0700

----------------------------------------------------------------------
 3rdparty/libprocess/src/libevent.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/b9da8752/3rdparty/libprocess/src/libevent.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/libevent.cpp b/3rdparty/libprocess/src/libevent.cpp
index 2b82930..67e7501 100644
--- a/3rdparty/libprocess/src/libevent.cpp
+++ b/3rdparty/libprocess/src/libevent.cpp
@@ -179,7 +179,13 @@ void EventLoop::initialize()
   // when the implementation settles and after we gain confidence.
   event_enable_debug_mode();
 
-  base = event_base_new();
+  // TODO(jmlvanre): Allow support for 'epoll' once SSL related
+  // issues are resolved.
+  struct event_config* config = event_config_new();
+  event_config_avoid_method(config, "epoll");
+
+  base = event_base_new_with_config(config);
+
   if (base == NULL) {
     LOG(FATAL) << "Failed to initialize, event_base_new";
   }