mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 21:12:48 +01:00
7d2e98d4fe
64e1ddd255771e57a88a20f07dbde04a83bf0c75 log: call LogPrint only once with time data samples (Martin Zumsande)
Pull request description:
When timedata samples are logged, `LogPrint()` is currently invoked multiple times on the same log entry.
This can lead to chaos in the log when other threads log concurrently, as in this example which motivated this PR:
```
2021-09-20T00:28:57Z -48 -26 -11 -8 -6 Addrman checks started: new 37053, tried 83, total 37136
2021-09-20T00:28:57Z -3 -1 -1 -1 -1 +0 | nTimeOffset = -3 (+0 minutes)
```
Fix this by building the log message in a string and logging it one `LogPrint()` call. I also changed the wording slightly so that it becomes understandable what is being logged, example:
```
2021-09-21T21:03:24Z time data samples: -43 -18 -12 -4 -1 -1 +0 +0 +268 | median offset = -1 (+0 minutes)
```
ACKs for top commit:
jnewbery:
Tested ACK 64e1ddd255
laanwj:
Tested ACK 64e1ddd255771e57a88a20f07dbde04a83bf0c75, new message lgtm
Tree-SHA512: ffb7a93166cc8fd6a39200b9e03a9d1e8e975b7ded822ccddd015f553258b991162a5cb867501f426d3ebcfef4f32f0e06e17b18e6b01486b967595d102f8379
111 lines
4.0 KiB
C++
111 lines
4.0 KiB
C++
// Copyright (c) 2014-2020 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#if defined(HAVE_CONFIG_H)
|
|
#include <config/bitcoin-config.h>
|
|
#endif
|
|
|
|
#include <timedata.h>
|
|
|
|
#include <netaddress.h>
|
|
#include <node/ui_interface.h>
|
|
#include <sync.h>
|
|
#include <tinyformat.h>
|
|
#include <util/system.h>
|
|
#include <util/translation.h>
|
|
#include <warnings.h>
|
|
|
|
static Mutex g_timeoffset_mutex;
|
|
static int64_t nTimeOffset GUARDED_BY(g_timeoffset_mutex) = 0;
|
|
|
|
/**
|
|
* "Never go to sea with two chronometers; take one or three."
|
|
* Our three time sources are:
|
|
* - System clock
|
|
* - Median of other nodes clocks
|
|
* - The user (asking the user to fix the system clock if the first two disagree)
|
|
*/
|
|
int64_t GetTimeOffset()
|
|
{
|
|
LOCK(g_timeoffset_mutex);
|
|
return nTimeOffset;
|
|
}
|
|
|
|
int64_t GetAdjustedTime()
|
|
{
|
|
return GetTime() + GetTimeOffset();
|
|
}
|
|
|
|
#define BITCOIN_TIMEDATA_MAX_SAMPLES 200
|
|
|
|
void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample)
|
|
{
|
|
LOCK(g_timeoffset_mutex);
|
|
// Ignore duplicates
|
|
static std::set<CNetAddr> setKnown;
|
|
if (setKnown.size() == BITCOIN_TIMEDATA_MAX_SAMPLES)
|
|
return;
|
|
if (!setKnown.insert(ip).second)
|
|
return;
|
|
|
|
// Add data
|
|
static CMedianFilter<int64_t> vTimeOffsets(BITCOIN_TIMEDATA_MAX_SAMPLES, 0);
|
|
vTimeOffsets.input(nOffsetSample);
|
|
LogPrint(BCLog::NET, "added time data, samples %d, offset %+d (%+d minutes)\n", vTimeOffsets.size(), nOffsetSample, nOffsetSample / 60);
|
|
|
|
// There is a known issue here (see issue #4521):
|
|
//
|
|
// - The structure vTimeOffsets contains up to 200 elements, after which
|
|
// any new element added to it will not increase its size, replacing the
|
|
// oldest element.
|
|
//
|
|
// - The condition to update nTimeOffset includes checking whether the
|
|
// number of elements in vTimeOffsets is odd, which will never happen after
|
|
// there are 200 elements.
|
|
//
|
|
// But in this case the 'bug' is protective against some attacks, and may
|
|
// actually explain why we've never seen attacks which manipulate the
|
|
// clock offset.
|
|
//
|
|
// So we should hold off on fixing this and clean it up as part of
|
|
// a timing cleanup that strengthens it in a number of other ways.
|
|
//
|
|
if (vTimeOffsets.size() >= 5 && vTimeOffsets.size() % 2 == 1) {
|
|
int64_t nMedian = vTimeOffsets.median();
|
|
std::vector<int64_t> vSorted = vTimeOffsets.sorted();
|
|
// Only let other nodes change our time by so much
|
|
int64_t max_adjustment = std::max<int64_t>(0, gArgs.GetArg("-maxtimeadjustment", DEFAULT_MAX_TIME_ADJUSTMENT));
|
|
if (nMedian >= -max_adjustment && nMedian <= max_adjustment) {
|
|
nTimeOffset = nMedian;
|
|
} else {
|
|
nTimeOffset = 0;
|
|
|
|
static bool fDone;
|
|
if (!fDone) {
|
|
// If nobody has a time different than ours but within 5 minutes of ours, give a warning
|
|
bool fMatch = false;
|
|
for (const int64_t nOffset : vSorted) {
|
|
if (nOffset != 0 && nOffset > -5 * 60 && nOffset < 5 * 60) fMatch = true;
|
|
}
|
|
|
|
if (!fMatch) {
|
|
fDone = true;
|
|
bilingual_str strMessage = strprintf(_("Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly."), PACKAGE_NAME);
|
|
SetMiscWarning(strMessage.translated);
|
|
uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (LogAcceptCategory(BCLog::NET)) {
|
|
std::string log_message{"time data samples: "};
|
|
for (const int64_t n : vSorted) {
|
|
log_message += strprintf("%+d ", n);
|
|
}
|
|
log_message += strprintf("| median offset = %+d (%+d minutes)", nTimeOffset, nTimeOffset / 60);
|
|
LogPrint(BCLog::NET, "%s\n", log_message);
|
|
}
|
|
}
|
|
}
|