highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-01 00:34:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9606: net: Consistently use GetTimeMicros() for inactivity checks

Browse Source 
99464bc net: Consistently use GetTimeMicros() for inactivity checks (Suhas Daftuar)
This commit is contained in:
Wladimir J. van der Laan
2017-01-26 09:57:01 +01:00
parent f89502306d 99464bc38e
commit 3f9f9629cc
5 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/rpc/misc.cpp
View File

@@ -431,22 +431,16 @@ UniValue setmocktime(const JSONRPCRequest& request)
if (!Params().MineBlocksOnDemand())
throw runtime_error("setmocktime for regression testing (-regtest mode) only");
// cs_vNodes is locked and node send/receive times are updated
// atomically with the time change to prevent peers from being
// disconnected because we think we haven't communicated with them
// in a long time.
// For now, don't change mocktime if we're in the middle of validation, as
// this could have an effect on mempool time-based eviction, as well as
// IsCurrentForFeeEstimation() and IsInitialBlockDownload().
// TODO: figure out the right way to synchronize around mocktime, and
// ensure all callsites of GetTime() are accessing this safely.
LOCK(cs_main);
RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM));
SetMockTime(request.params[0].get_int64());
uint64_t t = GetTime();
if(g_connman) {
g_connman->ForEachNode([t](CNode* pnode) {
pnode->nLastSend = pnode->nLastRecv = t;
});
}
return NullUniValue;
}