aboutsummaryrefslogtreecommitdiff
path: root/src/net.h
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2016-12-31 02:05:36 -0500
committerCory Fields <cory-nospam-@coryfields.com>2017-01-12 23:08:08 -0500
commite60360e139852c655930e99d4bb4db554cd8385e (patch)
treeadfb51a4f75f327b713de79412fa75c7292f7db0 /src/net.h
parent991955ee81034dc3fbc1c2a8e60c04fc9e0b538c (diff)
downloadbitcoin-e60360e139852c655930e99d4bb4db554cd8385e.tar.xz
net: remove cs_vRecvMsg
vRecvMsg is now only touched by the socket handler thread. The accounting vars (nRecvBytes/nLastRecv/mapRecvBytesPerMsgCmd) are also only used by the socket handler thread, with the exception of queries from rpc/gui. These accesses are not threadsafe, but they never were. This needs to be addressed separately. Also, update comment describing data flow
Diffstat (limited to 'src/net.h')
-rw-r--r--src/net.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/net.h b/src/net.h
index db73be477f..982a08f03a 100644
--- a/src/net.h
+++ b/src/net.h
@@ -613,8 +613,6 @@ public:
size_t nProcessQueueSize;
std::deque<CInv> vRecvGetData;
- std::list<CNetMessage> vRecvMsg;
- CCriticalSection cs_vRecvMsg;
uint64_t nRecvBytes;
std::atomic<int> nRecvVersion;
@@ -726,6 +724,7 @@ private:
const ServiceFlags nLocalServices;
const int nMyStartingHeight;
int nSendVersion;
+ std::list<CNetMessage> vRecvMsg; // Used only by SocketHandler thread
public:
NodeId GetId() const {
@@ -746,7 +745,6 @@ public:
return nRefCount;
}
- // requires LOCK(cs_vRecvMsg)
bool ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete);
void SetRecvVersion(int nVersionIn)