admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call event_assign() instead of event_set(), when available.

Browse Source 
event_set() has been deprecated and doesn't allow passing the main loop to be passed to initialize the event.  event_assign() is the method to call in Event2 when available.  However, we still need to be compatible with Chromium's version of libevent, so there's an #ifdef check in the meantime.

BUG=

Review-Url: https://codereview.webrtc.org/2141193002
Cr-Commit-Position: refs/heads/master@{#13454}
This commit is contained in:
tommi 2016-07-13 00:56:40 -07:00 committed by Commit bot
parent 927c408ba9
commit 7b020da9d7
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/base/task_queue_libevent.cc
View File

@ -124,8 +124,19 @@ TaskQueue::TaskQueue(const char* queue_name)
SetNonBlocking(fds[1]);
wakeup_pipe_out_ = fds[0];
wakeup_pipe_in_ = fds[1];
// TODO(tommi): This is a hack to support two versions of libevent that we're
// compatible with. The method we really want to call is event_assign(),
// since event_set() has been marked as deprecated (and doesn't accept
// passing event_base__ as a parameter). However, the version of libevent
// that we have in Chromium, doesn't have event_assign(), so we need to call
// event_set() there.
#if defined(_EVENT2_EVENT_H_)
event_assign(wakeup_event_.get(), event_base_, wakeup_pipe_out_,
EV_READ | EV_PERSIST, OnWakeup, this);
#else
event_set(wakeup_event_.get(), wakeup_pipe_out_, EV_READ | EV_PERSIST,
OnWakeup, this);
#endif
event_base_set(event_base_, wakeup_event_.get());
event_add(wakeup_event_.get(), 0);
thread_.Start();