mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 20:42:59 +01:00
afdb731442
0ae8f18dfe143051fec6ae10ea7df10142e3ff2f build: add -Wgnu to compile flags (fanquake)
3a0fd7726b8b916de6cce33bb67f48990575f923 Remove use of non-standard zero variadic macros (Ben Woosley)
49f6178c3e5e3ad54a419da9d8523207da17fc64 Drop unused LOG_TIME_MICROS helper (Ben Woosley)
5d4999951ee32e333b511245862628e80f83b703 prevector: Avoid unnamed struct, which is a GNU extension (DesWurstes)
Pull request description:
Since we [started using](https://github.com/bitcoin/bitcoin/pull/7165) the `ax_cxx_compile_stdcxx.m4` macro we've been passing `[noext]` to indicate that we don't want to use an extended mode, i.e GNU extensions. Speaking to Cory he clarified that the intention was to "require only vanilla c++11 and turn _off_ extension support so they would fail to compile".
However in the codebase we are currently making use of some GNU extensions. We should either remove there usage, or at least amend our CXX compiler checks. I'd prefer the former.
#### anonymous structs
```bash
./prevector.h:153:9: warning: anonymous structs are a GNU extension [-Wgnu-anonymous-struct]
struct {
```
This is fixed in b849212c1e.
#### variadic macros
```bash
./undo.h:57:50: warning: must specify at least one argument for '...' parameter of variadic macro [-Wgnu-zero-variadic-macro-arguments]
::Unserialize(s, VARINT(nVersionDummy));
```
This is taken care of in #18087.
The `LOG_TIME_*` macros introduced in #16805 make use of a [GNU extension](https://gcc.gnu.org/onlinedocs/cpp/Variadic-Macros.html).
```bash
In file included from validation.cpp:22:
./logging/timer.h:99:99: warning: token pasting of ',' and __VA_ARGS__ is a GNU extension [-Wgnu-zero-variadic-macro-arguments]
BCLog::Timer<std::chrono::milliseconds> PASTE2(logging_timer, __COUNTER__)(__func__, end_msg, ## __VA_ARGS__)
^
./logging/timer.h:99:99: warning: token pasting of ',' and __VA_ARGS__ is a GNU extension [-Wgnu-zero-variadic-macro-arguments]
./logging/timer.h:99:99: warning: token pasting of ',' and __VA_ARGS__ is a GNU extension [-Wgnu-zero-variadic-macro-arguments]
./logging/timer.h:99:99: warning: token pasting of ',' and __VA_ARGS__ is a GNU extension [-Wgnu-zero-variadic-macro-arguments]
./logging/timer.h:99:99: warning: token pasting of ',' and __VA_ARGS__ is a GNU extension [-Wgnu-zero-variadic-macro-arguments]
./logging/timer.h:101:92: warning: token pasting of ',' and __VA_ARGS__ is a GNU extension [-Wgnu-zero-variadic-macro-arguments]
BCLog::Timer<std::chrono::seconds> PASTE2(logging_timer, __COUNTER__)(__func__, end_msg, ## __VA_ARGS__)
^
6 warnings generated.
```
This is fixed in 081a0ab64eb442bc85c4d4a4d3bc2c8e97ac2a6d and 612e8e138b97fc5ad2f38847300132a8fc423c3f.
#### prevention
To ensure that usage doesn't creep back in we can add [`-Wgnu`](https://clang.llvm.org/docs/DiagnosticsReference.html#wgnu) to our compile time flags, which will make Clang warn whenever it encounters GNU extensions.
This would close #14130.
Also related to #17230, where it's suggested we use a GNU extension, the `gnu::pure` attribute.
ACKs for top commit:
practicalswift:
ACK 0ae8f18dfe143051fec6ae10ea7df10142e3ff2f -- diff looks correct
MarcoFalke:
ACK 0ae8f18dfe143051fec6ae10ea7df10142e3ff2f
vasild:
utACK 0ae8f18df
dongcarl:
ACK 0ae8f18dfe143051fec6ae10ea7df10142e3ff2f
Tree-SHA512: c517404681ef8edf04c785731d26105bac9f3c9c958605aa24cbe399c649e7c5ee0c4aa8e714fd2b2d335e2fbea4d571e09b0dec36678ef871f0a6683ba6bb7f
103 lines
3.0 KiB
C++
103 lines
3.0 KiB
C++
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
// Copyright (c) 2009-2018 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#ifndef BITCOIN_LOGGING_TIMER_H
|
|
#define BITCOIN_LOGGING_TIMER_H
|
|
|
|
#include <logging.h>
|
|
#include <sync.h>
|
|
#include <util/time.h>
|
|
|
|
#include <chrono>
|
|
#include <string>
|
|
|
|
|
|
namespace BCLog {
|
|
|
|
//! RAII-style object that outputs timing information to logs.
|
|
template <typename TimeType>
|
|
class Timer
|
|
{
|
|
public:
|
|
//! If log_category is left as the default, end_msg will log unconditionally
|
|
//! (instead of being filtered by category).
|
|
Timer(
|
|
std::string prefix,
|
|
std::string end_msg,
|
|
BCLog::LogFlags log_category = BCLog::LogFlags::ALL) :
|
|
m_prefix(std::move(prefix)),
|
|
m_title(std::move(end_msg)),
|
|
m_log_category(log_category)
|
|
{
|
|
this->Log(strprintf("%s started", m_title));
|
|
m_start_t = GetTime<std::chrono::microseconds>();
|
|
}
|
|
|
|
~Timer()
|
|
{
|
|
this->Log(strprintf("%s completed", m_title));
|
|
}
|
|
|
|
void Log(const std::string& msg)
|
|
{
|
|
const std::string full_msg = this->LogMsg(msg);
|
|
|
|
if (m_log_category == BCLog::LogFlags::ALL) {
|
|
LogPrintf("%s\n", full_msg);
|
|
} else {
|
|
LogPrint(m_log_category, "%s\n", full_msg);
|
|
}
|
|
}
|
|
|
|
std::string LogMsg(const std::string& msg)
|
|
{
|
|
const auto end_time = GetTime<std::chrono::microseconds>() - m_start_t;
|
|
if (m_start_t.count() <= 0) {
|
|
return strprintf("%s: %s", m_prefix, msg);
|
|
}
|
|
|
|
std::string units = "";
|
|
float divisor = 1;
|
|
|
|
if (std::is_same<TimeType, std::chrono::microseconds>::value) {
|
|
units = "μs";
|
|
} else if (std::is_same<TimeType, std::chrono::milliseconds>::value) {
|
|
units = "ms";
|
|
divisor = 1000.;
|
|
} else if (std::is_same<TimeType, std::chrono::seconds>::value) {
|
|
units = "s";
|
|
divisor = 1000. * 1000.;
|
|
}
|
|
|
|
const float time_ms = end_time.count() / divisor;
|
|
return strprintf("%s: %s (%.2f%s)", m_prefix, msg, time_ms, units);
|
|
}
|
|
|
|
private:
|
|
std::chrono::microseconds m_start_t{};
|
|
|
|
//! Log prefix; usually the name of the function this was created in.
|
|
const std::string m_prefix{};
|
|
|
|
//! A descriptive message of what is being timed.
|
|
const std::string m_title{};
|
|
|
|
//! Forwarded on to LogPrint if specified - has the effect of only
|
|
//! outputting the timing log when a particular debug= category is specified.
|
|
const BCLog::LogFlags m_log_category{};
|
|
|
|
};
|
|
|
|
} // namespace BCLog
|
|
|
|
|
|
#define LOG_TIME_MILLIS_WITH_CATEGORY(end_msg, log_category) \
|
|
BCLog::Timer<std::chrono::milliseconds> PASTE2(logging_timer, __COUNTER__)(__func__, end_msg, log_category)
|
|
#define LOG_TIME_SECONDS(end_msg) \
|
|
BCLog::Timer<std::chrono::seconds> PASTE2(logging_timer, __COUNTER__)(__func__, end_msg)
|
|
|
|
|
|
#endif // BITCOIN_LOGGING_TIMER_H
|