diff options
| author | Pieter Wuille <[email protected]> | 2013-10-19 15:55:08 +0200 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2013-10-26 14:43:26 +0200 |
| commit | a616206865d62106944300d7b912e3af8d357610 (patch) | |
| tree | 18e4c06383c1f3ce6a2bda72857afe787fadaeef /src/util.cpp | |
| parent | Merge pull request #3144 from Diapolo/message_sendcoinsdialog (diff) | |
| download | discoin-a616206865d62106944300d7b912e3af8d357610.tar.xz discoin-a616206865d62106944300d7b912e3af8d357610.zip | |
Give peer time-adjustment data an own lock
Instead of relying on cs_main (defined in a different module) to
prevent concurrent access to it.
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/util.cpp b/src/util.cpp index 71994587c..e098ee56c 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -81,7 +81,6 @@ bool fServer = false; string strMiscWarning; bool fNoListen = false; bool fLogTimestamps = false; -CMedianFilter<int64> vTimeOffsets(200,0); volatile bool fReopenDebugLog = false; // Init OpenSSL library multithreading support @@ -1296,10 +1295,12 @@ void SetMockTime(int64 nMockTimeIn) nMockTime = nMockTimeIn; } +static CCriticalSection cs_nTimeOffset; static int64 nTimeOffset = 0; int64 GetTimeOffset() { + LOCK(cs_nTimeOffset); return nTimeOffset; } @@ -1312,12 +1313,14 @@ void AddTimeData(const CNetAddr& ip, int64 nTime) { int64 nOffsetSample = nTime - GetTime(); + LOCK(cs_nTimeOffset); // Ignore duplicates static set<CNetAddr> setKnown; if (!setKnown.insert(ip).second) return; // Add data + static CMedianFilter<int64> vTimeOffsets(200,0); vTimeOffsets.input(nOffsetSample); LogPrintf("Added time data, samples %d, offset %+"PRI64d" (%+"PRI64d" minutes)\n", vTimeOffsets.size(), nOffsetSample, nOffsetSample/60); if (vTimeOffsets.size() >= 5 && vTimeOffsets.size() % 2 == 1) |