github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-21 13:54:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

More Mac tap improvements and threading efficiency improvements.

Browse source
This commit is contained in:
Adam Ierymenko 2018-11-13 13:51:25 -08:00
commit 6684559cd9
5 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
osdep/BlockingQueue.hpp
View file

@ -54,20 +54,16 @@ public:
c.notify_one();
}
inline void postWait(T t,unsigned long maxQueueSize)
inline void postLimit(T t,const unsigned long limit)
{
std::unique_lock<std::mutex> lock(m);
for(;;) {
{
std::lock_guard<std::mutex> lock(m);
if (q.size() < maxQueueSize) {
q.push(t);
c.notify_one();
return;
}
}
if (!r)
if (q.size() < limit) {
q.push(t);
c.notify_one();
break;
Thread::sleep(1);
}
gc.wait(lock);
}
}
@ -84,10 +80,14 @@ public:
if (!r) return false;
while (q.empty()) {
c.wait(lock);
if (!r) return false;
if (!r) {
gc.notify_all();
return false;
}
}
value = q.front();
q.pop();
gc.notify_all();
return true;
}
@ -118,7 +118,7 @@ private:
volatile bool r;
std::queue<T> q;
mutable std::mutex m;
mutable std::condition_variable c;
mutable std::condition_variable c,gc;
};
} // namespace ZeroTier

4
osdep/MacEthernetTap.cpp
View file

@ -287,7 +287,9 @@ void MacEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,co
iov[1].iov_len = 15;
iov[2].iov_base = const_cast<void *>(data);
iov[2].iov_len = len;
_putLock.lock();
writev(_agentStdin,iov,3);
_putLock.unlock();
}
}
@ -396,8 +398,6 @@ void MacEthernetTap::threadMain()
break;
}
}
} else {
break;
}
}
if (FD_ISSET(_agentStderr,&readfds)) {

2
osdep/MacEthernetTap.hpp
View file

@ -38,6 +38,7 @@
#include "../node/MAC.hpp"
#include "../node/InetAddress.hpp"
#include "../node/MulticastGroup.hpp"
#include "../node/Mutex.hpp"
#include "Thread.hpp"
@ -80,6 +81,7 @@ private:
std::string _homePath;
std::string _dev;
std::vector<MulticastGroup> _multicastGroups;
Mutex _putLock;
unsigned int _mtu;
unsigned int _metric;
int _shutdownSignalPipe[2];

11
osdep/MacEthernetTapAgent.c
View file

@ -104,8 +104,8 @@
#define P_IFCONFIG "/sbin/ifconfig"
static unsigned char s_pktReadBuf[524288] __attribute__ ((__aligned__(16)));
static unsigned char s_stdinReadBuf[524288] __attribute__ ((__aligned__(16)));
static unsigned char s_pktReadBuf[262144] __attribute__ ((__aligned__(16)));
static unsigned char s_stdinReadBuf[262144] __attribute__ ((__aligned__(16)));
static char s_deviceName[IFNAMSIZ];
static char s_peerDeviceName[IFNAMSIZ];
static int s_bpffd = -1;
@ -322,9 +322,6 @@ int main(int argc,char **argv)
return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
}
fcntl(s_ndrvfd,F_SETFL,fcntl(s_ndrvfd,F_GETFL)|O_NONBLOCK);
fcntl(s_bpffd,F_SETFL,fcntl(s_bpffd,F_GETFL)|O_NONBLOCK);
fprintf(stderr,"I %s %s %d.%d.%d.%d\n",s_deviceName,s_peerDeviceName,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION,ZEROTIER_ONE_VERSION_BUILD);
FD_ZERO(&rfds);
@ -357,8 +354,6 @@ int main(int argc,char **argv)
}
p += BPF_WORDALIGN(h->bh_hdrlen + h->bh_caplen);
}
} else {
return ZT_MACETHERNETTAPAGENT_EXIT_CODE_READ_ERROR;
}
}
@ -431,8 +426,6 @@ int main(int argc,char **argv)
break;
}
}
} else {
return ZT_MACETHERNETTAPAGENT_EXIT_CODE_READ_ERROR;
}
}
}