void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Moar threadz"

Browse source 
This reverts commit 101a3a7d74.
This commit is contained in:
Adam Ierymenko 2020-11-16 19:06:52 -08:00
parent 101a3a7d74
commit 0795dbf5f1
2 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
osdep/LinuxEthernetTap.cpp
View file

@ -292,42 +292,36 @@ LinuxEthernetTap::LinuxEthernetTap(
} }
}); });
for(int k=0;k<2;++k) { _tapProcessorThread = std::thread([this] {
_tapProcessorThread[k] = std::thread([this] { MAC to,from;
MAC to,from; std::pair<void *,int> qi;
std::pair<void *,int> qi; while (_tapq.get(qi)) {
while (_tapq.get(qi)) { uint8_t *const b = reinterpret_cast<uint8_t *>(qi.first);
uint8_t *const b = reinterpret_cast<uint8_t *>(qi.first); if (b) {
if (b) { to.setTo(b, 6);
to.setTo(b, 6); from.setTo(b + 6, 6);
from.setTo(b + 6, 6); unsigned int etherType = Utils::ntoh(((const uint16_t *)b)[6]);
unsigned int etherType = Utils::ntoh(((const uint16_t *)b)[6]); _handler(_arg, nullptr, _nwid, from, to, etherType, 0, (const void *)(b + 14),(unsigned int)(qi.second - 14));
_handler(_arg, nullptr, _nwid, from, to, etherType, 0, (const void *)(b + 14),(unsigned int)(qi.second - 14)); {
{ std::lock_guard<std::mutex> l(_buffers_l);
std::lock_guard<std::mutex> l(_buffers_l); _buffers.push_back(qi.first);
_buffers.push_back(qi.first); }
} } else break;
} else break; }
} });
});
}
} }
LinuxEthernetTap::~LinuxEthernetTap() LinuxEthernetTap::~LinuxEthernetTap()
{ {
(void)::write(_shutdownSignalPipe[1],"\0",1); // causes thread to exit (void)::write(_shutdownSignalPipe[1],"\0",1); // causes thread to exit
for(int k=0;k<64;++k) { _tapq.post(std::pair<void *,int>(nullptr,0));
_tapq.post(std::pair<void *,int>(nullptr,0));
}
::close(_fd); ::close(_fd);
::close(_shutdownSignalPipe[0]); ::close(_shutdownSignalPipe[0]);
::close(_shutdownSignalPipe[1]); ::close(_shutdownSignalPipe[1]);
_tapReaderThread.join(); _tapReaderThread.join();
for(int k=0;k<2;++k) { _tapProcessorThread.join();
_tapProcessorThread[k].join();
}
for(std::vector<void *>::iterator i(_buffers.begin());i!=_buffers.end();++i) for(std::vector<void *>::iterator i(_buffers.begin());i!=_buffers.end();++i)
free(*i); free(*i);

2
osdep/LinuxEthernetTap.hpp
View file

@ -71,7 +71,7 @@ private:
int _shutdownSignalPipe[2]; int _shutdownSignalPipe[2];
std::atomic_bool _enabled; std::atomic_bool _enabled;
std::thread _tapReaderThread; std::thread _tapReaderThread;
std::thread _tapProcessorThread[2]; std::thread _tapProcessorThread;
std::mutex _buffers_l; std::mutex _buffers_l;
std::vector<void *> _buffers; std::vector<void *> _buffers;
BlockingQueue< std::pair<void *,int> > _tapq; BlockingQueue< std::pair<void *,int> > _tapq;