Skip to content

L
libzmq
Unverified Commit aee5fc25 authored by Luca Boccassi's avatar Luca Boccassi Committed by GitHub
Browse files
Options

Merge pull request #3155 from pijyoi/wepoll_missing_files 

wepoll integration fixes
parents d07ddb1b 5a1ea0c3
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
Makefile.am
View file @ aee5fc25
...@@ -259,7 +259,8 @@ src_libzmq_la_SOURCES = \ ...@@ -259,7 +259,8 @@ src_libzmq_la_SOURCES = \
if USE_WEPOLL if USE_WEPOLL
src_libzmq_la_SOURCES += \ src_libzmq_la_SOURCES += \
external/wepoll/wepoll.c external/wepoll/wepoll.c \
external/wepoll/wepoll.h
endif endif
if USE_TWEETNACL if USE_TWEETNACL
...@@ -974,6 +975,9 @@ endif ...@@ -974,6 +975,9 @@ endif
EXTRA_DIST = \ EXTRA_DIST = \
external/unity/license.txt \ external/unity/license.txt \
external/unity/version.txt \ external/unity/version.txt \
external/wepoll/license.txt \
external/wepoll/version.txt \
external/wepoll/README.md \
CMakeLists.txt \ CMakeLists.txt \
autogen.sh \ autogen.sh \
version.sh \ version.sh \
......
src/epoll.cpp
View file @ aee5fc25
...@@ -54,7 +54,7 @@ const zmq::epoll_t::epoll_fd_t zmq::epoll_t::epoll_retired_fd = ...@@ -54,7 +54,7 @@ const zmq::epoll_t::epoll_fd_t zmq::epoll_t::epoll_retired_fd =
zmq::epoll_t::epoll_t (const zmq::thread_ctx_t &ctx_) : zmq::epoll_t::epoll_t (const zmq::thread_ctx_t &ctx_) :
worker_poller_base_t (ctx_) worker_poller_base_t (ctx_)
{ {
#ifdef ZMQ_USE_EPOLL_CLOEXEC #ifdef ZMQ_IOTHREAD_POLLER_USE_EPOLL_CLOEXEC
// Setting this option result in sane behaviour when exec() functions // Setting this option result in sane behaviour when exec() functions
// are used. Old sockets are closed and don't block TCP ports, avoid // are used. Old sockets are closed and don't block TCP ports, avoid
// leaks, etc. // leaks, etc.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment