LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Use unique_ptr for sem{Addnode,Outbound} (CSemaphore)

Browse source
This commit is contained in:
practicalswift 2017-08-09 16:07:22 +02:00
parent 73db0635a3
commit 8ccf1bb0c3
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/net.cpp
View file

@ -2222,8 +2222,6 @@ CConnman::CConnman(uint64_t nSeed0In, uint64_t nSeed1In) : nSeed0(nSeed0In), nSe
nLastNodeId = 0; nLastNodeId = 0;
nSendBufferMaxSize = 0; nSendBufferMaxSize = 0;
nReceiveFloodSize = 0; nReceiveFloodSize = 0;
semOutbound = nullptr;
semAddnode = nullptr;
flagInterruptMsgProc = false; flagInterruptMsgProc = false;
SetTryNewOutboundPeer(false); SetTryNewOutboundPeer(false);
@ -2329,11 +2327,11 @@ bool CConnman::Start(CScheduler& scheduler, const Options& connOptions)
if (semOutbound == nullptr) { if (semOutbound == nullptr) {
// initialize semaphore // initialize semaphore
semOutbound = new CSemaphore(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections)); semOutbound = std::unique_ptr<CSemaphore>(new CSemaphore(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections)));
} }
if (semAddnode == nullptr) { if (semAddnode == nullptr) {
// initialize semaphore // initialize semaphore
semAddnode = new CSemaphore(nMaxAddnode); semAddnode = std::unique_ptr<CSemaphore>(new CSemaphore(nMaxAddnode));
} }
// //
@ -2456,10 +2454,8 @@ void CConnman::Stop()
vNodes.clear(); vNodes.clear();
vNodesDisconnected.clear(); vNodesDisconnected.clear();
vhListenSocket.clear(); vhListenSocket.clear();
delete semOutbound; semOutbound.reset();
semOutbound = nullptr; semAddnode.reset();
delete semAddnode;
semAddnode = nullptr;
} }
void CConnman::DeleteNode(CNode* pnode) void CConnman::DeleteNode(CNode* pnode)

4
src/net.h
View file

@ -399,8 +399,8 @@ private:
/** Services this instance offers */ /** Services this instance offers */
ServiceFlags nLocalServices; ServiceFlags nLocalServices;
CSemaphore *semOutbound; std::unique_ptr<CSemaphore> semOutbound;
CSemaphore *semAddnode; std::unique_ptr<CSemaphore> semAddnode;
int nMaxConnections; int nMaxConnections;
int nMaxOutbound; int nMaxOutbound;
int nMaxAddnode; int nMaxAddnode;