Skip to content

Fix build on FreeBSD 13 #7730

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

Merged
bryancall merged 1 commit into from
Apr 23, 2021
Merged

Fix build on FreeBSD 13 #7730

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion include/tscore/EventNotify.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class EventNotify
~EventNotify();

private:
#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && TS_USE_EPOLL == 1
int m_event_fd;
int m_epoll_fd;
#else
Expand Down
18 changes: 9 additions & 9 deletions src/tscore/EventNotify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
#include "tscore/ink_hrtime.h"
#include "tscore/ink_defs.h"

#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && TS_USE_EPOLL == 1
#include <sys/eventfd.h>
#include <fcntl.h>
#include <sys/epoll.h>
#endif

EventNotify::EventNotify()
{
#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && TS_USE_EPOLL == 1
int ret;
struct epoll_event ev;

Expand All @@ -63,7 +63,7 @@ EventNotify::EventNotify()
void
EventNotify::signal()
{
#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && TS_USE_EPOLL == 1
uint64_t value = 1;
//
// If the addition would cause the counter's value of eventfd
Expand All @@ -79,7 +79,7 @@ EventNotify::signal()
int
EventNotify::wait()
{
#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && TS_USE_EPOLL == 1
ssize_t nr, nr_fd;
uint64_t value = 0;
struct epoll_event ev;
Expand Down Expand Up @@ -107,7 +107,7 @@ EventNotify::wait()
int
EventNotify::timedwait(int timeout) // milliseconds
{
#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && TS_USE_EPOLL == 1
ssize_t nr, nr_fd = 0;
uint64_t value = 0;
struct epoll_event ev;
Expand Down Expand Up @@ -148,7 +148,7 @@ EventNotify::timedwait(int timeout) // milliseconds
void
EventNotify::lock()
{
#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && TS_USE_EPOLL == 1
// do nothing
#else
ink_mutex_acquire(&m_mutex);
Expand All @@ -158,7 +158,7 @@ EventNotify::lock()
bool
EventNotify::trylock()
{
#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && TS_USE_EPOLL == 1
return true;
#else
return ink_mutex_try_acquire(&m_mutex);
Expand All @@ -168,7 +168,7 @@ EventNotify::trylock()
void
EventNotify::unlock()
{
#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && TS_USE_EPOLL == 1
// do nothing
#else
ink_mutex_release(&m_mutex);
Expand All @@ -177,7 +177,7 @@ EventNotify::unlock()

EventNotify::~EventNotify()
{
#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && TS_USE_EPOLL == 1
close(m_event_fd);
close(m_epoll_fd);
#else
Expand Down