Skip to content

Commit b683491

Browse files
committed
scripted-diff: rename CNode::cs_hSocket to CNode::m_sock_mutex
-BEGIN VERIFY SCRIPT- sed -i -e 's/cs_hSocket/m_sock_mutex/g' $(git grep -l cs_hSocket) -END VERIFY SCRIPT-
1 parent c41a116 commit b683491

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/net.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
517517
void CNode::CloseSocketDisconnect()
518518
{
519519
fDisconnect = true;
520-
LOCK(cs_hSocket);
520+
LOCK(m_sock_mutex);
521521
if (m_sock) {
522522
LogPrint(BCLog::NET, "disconnecting peer=%d\n", id);
523523
m_sock.reset();
@@ -798,7 +798,7 @@ size_t CConnman::SocketSendData(CNode& node) const
798798
assert(data.size() > node.nSendOffset);
799799
int nBytes = 0;
800800
{
801-
LOCK(node.cs_hSocket);
801+
LOCK(node.m_sock_mutex);
802802
if (!node.m_sock) {
803803
break;
804804
}
@@ -1381,7 +1381,7 @@ bool CConnman::GenerateSelectSet(const std::vector<CNode*>& nodes,
13811381
select_send = !pnode->vSendMsg.empty();
13821382
}
13831383

1384-
LOCK(pnode->cs_hSocket);
1384+
LOCK(pnode->m_sock_mutex);
13851385
if (!pnode->m_sock) {
13861386
continue;
13871387
}
@@ -1562,7 +1562,7 @@ void CConnman::SocketHandlerConnected(const std::vector<CNode*>& nodes,
15621562
bool sendSet = false;
15631563
bool errorSet = false;
15641564
{
1565-
LOCK(pnode->cs_hSocket);
1565+
LOCK(pnode->m_sock_mutex);
15661566
if (!pnode->m_sock) {
15671567
continue;
15681568
}
@@ -1576,7 +1576,7 @@ void CConnman::SocketHandlerConnected(const std::vector<CNode*>& nodes,
15761576
uint8_t pchBuf[0x10000];
15771577
int nBytes = 0;
15781578
{
1579-
LOCK(pnode->cs_hSocket);
1579+
LOCK(pnode->m_sock_mutex);
15801580
if (!pnode->m_sock) {
15811581
continue;
15821582
}

src/net.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ class CNode
411411
* poll(2)-ing it for activity.
412412
* @see https://github.com/bitcoin/bitcoin/issues/21744 for details.
413413
*/
414-
std::shared_ptr<Sock> m_sock GUARDED_BY(cs_hSocket);
414+
std::shared_ptr<Sock> m_sock GUARDED_BY(m_sock_mutex);
415415

416416
/** Total size of all vSendMsg entries */
417417
size_t nSendSize GUARDED_BY(cs_vSend){0};
@@ -420,7 +420,7 @@ class CNode
420420
uint64_t nSendBytes GUARDED_BY(cs_vSend){0};
421421
std::deque<std::vector<unsigned char>> vSendMsg GUARDED_BY(cs_vSend);
422422
Mutex cs_vSend;
423-
Mutex cs_hSocket;
423+
Mutex m_sock_mutex;
424424
Mutex cs_vRecv;
425425

426426
RecursiveMutex cs_vProcessMsg;

0 commit comments

Comments
 (0)