Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ifdefs from linux NetworkListener (#1404)

Browse Source
This commit is contained in:
Peter Johnson
2018-11-01 23:27:22 -07:00
committed by GitHub
parent 9a38a3e188
commit 746f950a0b
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cscore/src/main/native/linux/NetworkListener.cpp
View File

@@ -7,7 +7,6 @@
#include "NetworkListener.h"
#ifdef __linux__
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
#include <sys/eventfd.h>
@@ -18,7 +17,6 @@
#include <unistd.h>
#include <cerrno>
#endif
#include "Log.h"
#include "Notifier.h"
@@ -33,9 +31,7 @@ class NetworkListener::Thread : public wpi::SafeThread {
wpi::Logger& m_logger;
Notifier& m_notifier;
#ifdef __linux__
int m_command_fd = -1;
#endif
};
NetworkListener::~NetworkListener() { Stop(); }
@@ -46,15 +42,12 @@ void NetworkListener::Stop() {
// Wake up thread
if (auto thr = m_owner.GetThread()) {
thr->m_active = false;
#ifdef __linux__
if (thr->m_command_fd >= 0) eventfd_write(thr->m_command_fd, 1);
#endif
}
m_owner.Stop();
}
void NetworkListener::Thread::Main() {
#ifdef __linux__
// Create event socket so we can be shut down
m_command_fd = ::eventfd(0, 0);
if (m_command_fd < 0) {
@@ -133,5 +126,4 @@ void NetworkListener::Thread::Main() {
::close(sd);
::close(m_command_fd);
m_command_fd = -1;
#endif
}