Skip to content

Bugfix: fluid_base work with libevent 2.1 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qiuwugang wants to merge 1 commit into
base: 0.2
Choose a base branch
from
Open

Bugfix: fluid_base work with libevent 2.1 #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion fluid/base/EventLoop.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ namespace fluid_base {
#define OF_MAX_LEN 0xFFFF

// See FIXME in EventLoop::EventLoop

#ifndef EVLOOP_NO_EXIT_ON_EMPTY
extern "C" void event_base_add_virtual(struct event_base *);
extern "C" void event_base_del_virtual(struct event_base *);
#endif


class EventLoop::LibEventEventLoop {
private:
Expand Down Expand Up @@ -41,7 +45,9 @@ EventLoop::EventLoop(int id) {
See:
http://stackoverflow.com/questions/7645217/user-triggered-event-in-libevent
*/
event_base_add_virtual(this->m_implementation->base);
#ifndef EVLOOP_NO_EXIT_ON_EMPTY
event_base_add_virtual(this->m_implementation->base);
#endif
}

EventLoop::~EventLoop() {
Expand All @@ -56,8 +62,13 @@ void EventLoop::run() {
event_base_dispatch(this->m_implementation->base);
// See note in EventLoop::EventLoop. Here we disable the virtual event
// to guarantee that nothing blocks.

#ifndef EVLOOP_NO_EXIT_ON_EMPTY
event_base_del_virtual(this->m_implementation->base);
event_base_loop(this->m_implementation->base, EVLOOP_NONBLOCK);
#else
event_base_loop(this->m_implementation->base, EVLOOP_NO_EXIT_ON_EMPTY);
#endif
}

void EventLoop::stop() {
Expand Down