Merge #8080: Do not use mempool for GETDATA for tx accepted after the last mempool req.

7e908c7 Do not use mempool for GETDATA for tx accepted after the last mempool req. (Gregory Maxwell)
This commit is contained in:
Wladimir J. van der Laan
2016-05-31 15:47:15 +02:00
5 changed files with 19 additions and 2 deletions

View File

@@ -17,6 +17,7 @@
#include "sync.h"
#include "uint256.h"
#include <atomic>
#include <deque>
#include <stdint.h>
@@ -414,6 +415,8 @@ public:
// Used for BIP35 mempool sending, also protected by cs_inventory
bool fSendMempool;
// Last time a "MEMPOOL" request was serviced.
std::atomic<int64_t> timeLastMempoolReq;
// Ping time measurement:
// The pong reply we're expecting, or 0 if no pong expected.
uint64_t nPingNonceSent;