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

Deadlock fix...

Browse Source
This commit is contained in:
Adam Ierymenko
2014-10-24 17:11:23 -07:00
parent 3857116724
commit a75a7547b4
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
testnet/SimNetSocketManager.hpp
View File

@@ -30,7 +30,7 @@
#include <map>
#include <utility>
#include <queue>
#include <vector>
#include "../node/Constants.hpp"
#include "../node/SocketManager.hpp"
@@ -98,7 +98,7 @@ public:
{
{
Mutex::Lock _l(_inbox_m);
_inbox.push(std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> >(from,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN>(data,len)));
_inbox.push_back(std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> >(from,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN>(data,len)));
}
_waitCond.signal();
}
@@ -116,7 +116,7 @@ private:
SharedPtr<Socket> _mySocket;
TransferStats _totals;
std::queue< std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> > > _inbox;
std::vector< std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> > > _inbox;
Mutex _inbox_m;
std::map< InetAddress,TransferStats > _stats;