gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Helps to use a proper multithreaded queue instead of ugly plebian hackery.

Browse Source
This commit is contained in:
Adam Ierymenko
2014-10-28 12:28:45 -07:00
parent 934a575a74
commit f873881a0d
7 changed files with 211 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
testnet/SimNetSocketManager.cpp
View File

@@ -73,32 +73,14 @@ bool SimNetSocketManager::send(const InetAddress &to,bool tcp,bool autoConnectTc
void SimNetSocketManager::poll(unsigned long timeout,void (*handler)(const SharedPtr<Socket> &,void *,const InetAddress &,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> &),void *arg)
{
std::vector< std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> > > inb;
{
Mutex::Lock _l(_inbox_m);
inb = _inbox;
_inbox.clear();
}
for(std::vector< std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> > >::iterator i(inb.begin());i!=inb.end();++i)
handler(_mySocket,arg,i->first,i->second);
if (timeout)
_waitCond.wait(timeout);
else _waitCond.wait();
{
Mutex::Lock _l(_inbox_m);
inb = _inbox;
_inbox.clear();
}
for(std::vector< std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> > >::iterator i(inb.begin());i!=inb.end();++i)
handler(_mySocket,arg,i->first,i->second);
std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> > msg;
if ((_inbox.pop(msg,timeout))&&(msg.second.size()))
handler(_mySocket,arg,msg.first,msg.second);
}
void SimNetSocketManager::whack()
{
_waitCond.signal();
_inbox.push(std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> >());
}
void SimNetSocketManager::closeTcpSockets()