mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
merge bitcoin#25102: Remove unused GetTimeSeconds
This commit is contained in:
parent
8f8e73242d
commit
cc7d2b8d0a
@ -11,6 +11,7 @@
|
|||||||
#include <chainparamsbase.h>
|
#include <chainparamsbase.h>
|
||||||
#include <clientversion.h>
|
#include <clientversion.h>
|
||||||
#include <compat.h>
|
#include <compat.h>
|
||||||
|
#include <compat/stdin.h>
|
||||||
#include <policy/feerate.h>
|
#include <policy/feerate.h>
|
||||||
#include <rpc/client.h>
|
#include <rpc/client.h>
|
||||||
#include <rpc/mining.h>
|
#include <rpc/mining.h>
|
||||||
@ -18,17 +19,19 @@
|
|||||||
#include <rpc/request.h>
|
#include <rpc/request.h>
|
||||||
#include <stacktraces.h>
|
#include <stacktraces.h>
|
||||||
#include <tinyformat.h>
|
#include <tinyformat.h>
|
||||||
|
#include <univalue.h>
|
||||||
#include <util/strencodings.h>
|
#include <util/strencodings.h>
|
||||||
#include <util/system.h>
|
#include <util/system.h>
|
||||||
#include <util/translation.h>
|
#include <util/translation.h>
|
||||||
#include <util/url.h>
|
#include <util/url.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <chrono>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
#include <cstdio>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <stdio.h>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
|
|
||||||
@ -40,8 +43,11 @@
|
|||||||
#include <event2/keyvalq_struct.h>
|
#include <event2/keyvalq_struct.h>
|
||||||
#include <support/events.h>
|
#include <support/events.h>
|
||||||
|
|
||||||
#include <univalue.h>
|
// The server returns time values from a mockable system clock, but it is not
|
||||||
#include <compat/stdin.h>
|
// trivial to get the mocked time from the server, nor is it needed for now, so
|
||||||
|
// just use a plain system_clock.
|
||||||
|
using CliClock = std::chrono::system_clock;
|
||||||
|
using CliSeconds = std::chrono::time_point<CliClock, std::chrono::seconds>;
|
||||||
|
|
||||||
const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
|
const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
|
||||||
UrlDecodeFn* const URL_DECODE = urlDecode;
|
UrlDecodeFn* const URL_DECODE = urlDecode;
|
||||||
@ -454,7 +460,7 @@ private:
|
|||||||
if (conn_type == "addr-fetch") return "addr";
|
if (conn_type == "addr-fetch") return "addr";
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
const int64_t m_time_now{GetTimeSeconds()};
|
const int64_t m_time_now{count_seconds(Now<CliSeconds>())};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static constexpr int ID_PEERINFO = 0;
|
static constexpr int ID_PEERINFO = 0;
|
||||||
|
@ -188,7 +188,7 @@ int main(int argc, char** argv)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
std::signal(SIGABRT, signal_handler);
|
std::signal(SIGABRT, signal_handler);
|
||||||
int64_t start_time = GetTimeSeconds();
|
const auto start_time{Now<SteadySeconds>()};
|
||||||
int tested = 0;
|
int tested = 0;
|
||||||
for (int i = 1; i < argc; ++i) {
|
for (int i = 1; i < argc; ++i) {
|
||||||
fs::path input_path(*(argv + i));
|
fs::path input_path(*(argv + i));
|
||||||
@ -209,8 +209,8 @@ int main(int argc, char** argv)
|
|||||||
buffer.clear();
|
buffer.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int64_t end_time = GetTimeSeconds();
|
const auto end_time{Now<SteadySeconds>()};
|
||||||
std::cout << g_fuzz_target << ": succeeded against " << tested << " files in " << (end_time - start_time) << "s." << std::endl;
|
std::cout << g_fuzz_target << ": succeeded against " << tested << " files in " << count_seconds(end_time - start_time) << "s." << std::endl;
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -297,9 +297,6 @@ BOOST_AUTO_TEST_CASE(util_FormatParseISO8601DateTime)
|
|||||||
BOOST_CHECK_EQUAL(ParseISO8601DateTime("1970-01-01T00:00:00Z"), 0);
|
BOOST_CHECK_EQUAL(ParseISO8601DateTime("1970-01-01T00:00:00Z"), 0);
|
||||||
BOOST_CHECK_EQUAL(ParseISO8601DateTime("1960-01-01T00:00:00Z"), 0);
|
BOOST_CHECK_EQUAL(ParseISO8601DateTime("1960-01-01T00:00:00Z"), 0);
|
||||||
BOOST_CHECK_EQUAL(ParseISO8601DateTime("2011-09-30T23:36:17Z"), 1317425777);
|
BOOST_CHECK_EQUAL(ParseISO8601DateTime("2011-09-30T23:36:17Z"), 1317425777);
|
||||||
|
|
||||||
auto time = GetTimeSeconds();
|
|
||||||
BOOST_CHECK_EQUAL(ParseISO8601DateTime(FormatISO8601DateTime(time)), time);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(util_FormatISO8601Date)
|
BOOST_AUTO_TEST_CASE(util_FormatISO8601Date)
|
||||||
|
@ -111,11 +111,6 @@ int64_t GetTimeMicros()
|
|||||||
return int64_t{GetSystemTime<std::chrono::microseconds>().count()};
|
return int64_t{GetSystemTime<std::chrono::microseconds>().count()};
|
||||||
}
|
}
|
||||||
|
|
||||||
int64_t GetTimeSeconds()
|
|
||||||
{
|
|
||||||
return int64_t{GetSystemTime<std::chrono::seconds>().count()};
|
|
||||||
}
|
|
||||||
|
|
||||||
int64_t GetTime() { return GetTime<std::chrono::seconds>().count(); }
|
int64_t GetTime() { return GetTime<std::chrono::seconds>().count(); }
|
||||||
|
|
||||||
std::string FormatISO8601DateTime(int64_t nTime) {
|
std::string FormatISO8601DateTime(int64_t nTime) {
|
||||||
|
@ -22,15 +22,20 @@ using SteadyMicroseconds = std::chrono::time_point<std::chrono::steady_clock, st
|
|||||||
void UninterruptibleSleep(const std::chrono::microseconds& n);
|
void UninterruptibleSleep(const std::chrono::microseconds& n);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper to count the seconds of a duration.
|
* Helper to count the seconds of a duration/time_point.
|
||||||
*
|
*
|
||||||
* All durations should be using std::chrono and calling this should generally
|
* All durations/time_points should be using std::chrono and calling this should generally
|
||||||
* be avoided in code. Though, it is still preferred to an inline t.count() to
|
* be avoided in code. Though, it is still preferred to an inline t.count() to
|
||||||
* protect against a reliance on the exact type of t.
|
* protect against a reliance on the exact type of t.
|
||||||
*
|
*
|
||||||
* This helper is used to convert durations before passing them over an
|
* This helper is used to convert durations/time_points before passing them over an
|
||||||
* interface that doesn't support std::chrono (e.g. RPC, debug log, or the GUI)
|
* interface that doesn't support std::chrono (e.g. RPC, debug log, or the GUI)
|
||||||
*/
|
*/
|
||||||
|
template <typename Clock>
|
||||||
|
constexpr int64_t count_seconds(std::chrono::time_point<Clock, std::chrono::seconds> t)
|
||||||
|
{
|
||||||
|
return t.time_since_epoch().count();
|
||||||
|
}
|
||||||
constexpr int64_t count_seconds(std::chrono::seconds t) { return t.count(); }
|
constexpr int64_t count_seconds(std::chrono::seconds t) { return t.count(); }
|
||||||
constexpr int64_t count_milliseconds(std::chrono::milliseconds t) { return t.count(); }
|
constexpr int64_t count_milliseconds(std::chrono::milliseconds t) { return t.count(); }
|
||||||
constexpr int64_t count_microseconds(std::chrono::microseconds t) { return t.count(); }
|
constexpr int64_t count_microseconds(std::chrono::microseconds t) { return t.count(); }
|
||||||
@ -52,8 +57,6 @@ int64_t GetTime();
|
|||||||
int64_t GetTimeMillis();
|
int64_t GetTimeMillis();
|
||||||
/** Returns the system time (not mockable) */
|
/** Returns the system time (not mockable) */
|
||||||
int64_t GetTimeMicros();
|
int64_t GetTimeMicros();
|
||||||
/** Returns the system time (not mockable) */
|
|
||||||
int64_t GetTimeSeconds(); // Like GetTime(), but not mockable
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DEPRECATED
|
* DEPRECATED
|
||||||
|
Loading…
Reference in New Issue
Block a user