aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVasil Dimov <vd@FreeBSD.org>2021-04-23 15:30:46 +0200
committerVasil Dimov <vd@FreeBSD.org>2022-01-28 06:41:10 +0100
commitb68349164827f14c472201cad54c4e19a3321261 (patch)
treeedf515dfd9cb40040672e999445ad5359ba295ad /src
parentc41a1162ac4da437c5d755e8fe2bf636bed22b0f (diff)
downloadbitcoin-b68349164827f14c472201cad54c4e19a3321261.tar.xz
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-
Diffstat (limited to 'src')
-rw-r--r--src/net.cpp10
-rw-r--r--src/net.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/net.cpp b/src/net.cpp
index d94542887b..eeaceebf1a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -517,7 +517,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
void CNode::CloseSocketDisconnect()
{
fDisconnect = true;
- LOCK(cs_hSocket);
+ LOCK(m_sock_mutex);
if (m_sock) {
LogPrint(BCLog::NET, "disconnecting peer=%d\n", id);
m_sock.reset();
@@ -798,7 +798,7 @@ size_t CConnman::SocketSendData(CNode& node) const
assert(data.size() > node.nSendOffset);
int nBytes = 0;
{
- LOCK(node.cs_hSocket);
+ LOCK(node.m_sock_mutex);
if (!node.m_sock) {
break;
}
@@ -1381,7 +1381,7 @@ bool CConnman::GenerateSelectSet(const std::vector<CNode*>& nodes,
select_send = !pnode->vSendMsg.empty();
}
- LOCK(pnode->cs_hSocket);
+ LOCK(pnode->m_sock_mutex);
if (!pnode->m_sock) {
continue;
}
@@ -1562,7 +1562,7 @@ void CConnman::SocketHandlerConnected(const std::vector<CNode*>& nodes,
bool sendSet = false;
bool errorSet = false;
{
- LOCK(pnode->cs_hSocket);
+ LOCK(pnode->m_sock_mutex);
if (!pnode->m_sock) {
continue;
}
@@ -1576,7 +1576,7 @@ void CConnman::SocketHandlerConnected(const std::vector<CNode*>& nodes,
uint8_t pchBuf[0x10000];
int nBytes = 0;
{
- LOCK(pnode->cs_hSocket);
+ LOCK(pnode->m_sock_mutex);
if (!pnode->m_sock) {
continue;
}
diff --git a/src/net.h b/src/net.h
index e0e0e930bf..be564dbade 100644
--- a/src/net.h
+++ b/src/net.h
@@ -411,7 +411,7 @@ public:
* poll(2)-ing it for activity.
* @see https://github.com/bitcoin/bitcoin/issues/21744 for details.
*/
- std::shared_ptr<Sock> m_sock GUARDED_BY(cs_hSocket);
+ std::shared_ptr<Sock> m_sock GUARDED_BY(m_sock_mutex);
/** Total size of all vSendMsg entries */
size_t nSendSize GUARDED_BY(cs_vSend){0};
@@ -420,7 +420,7 @@ public:
uint64_t nSendBytes GUARDED_BY(cs_vSend){0};
std::deque<std::vector<unsigned char>> vSendMsg GUARDED_BY(cs_vSend);
Mutex cs_vSend;
- Mutex cs_hSocket;
+ Mutex m_sock_mutex;
Mutex cs_vRecv;
RecursiveMutex cs_vProcessMsg;