From 532099657fc4be20a142729d160b9fc08f5c0842 Mon Sep 17 00:00:00 2001 From: naoto Date: Mon, 15 Sep 2025 16:49:46 +0900 Subject: [PATCH 1/2] fix type miss --- trantor/utils/Date.cc | 40 ++++++++++++++++++++-------------------- trantor/utils/Date.h | 8 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/trantor/utils/Date.cc b/trantor/utils/Date.cc index 0da38731..6890e740 100644 --- a/trantor/utils/Date.cc +++ b/trantor/utils/Date.cc @@ -55,29 +55,29 @@ const Date Date::date() struct timeval tv; gettimeofday(&tv, NULL); int64_t seconds = tv.tv_sec; - return Date(seconds * MICRO_SECONDS_PRE_SEC + tv.tv_usec); + return Date(seconds * MICRO_SECONDS_PER_SEC + tv.tv_usec); #else timeval tv; gettimeofday(&tv, NULL); int64_t seconds = tv.tv_sec; - return Date(seconds * MICRO_SECONDS_PRE_SEC + tv.tv_usec); + return Date(seconds * MICRO_SECONDS_PER_SEC + tv.tv_usec); #endif } const Date Date::after(double second) const { return Date(static_cast(microSecondsSinceEpoch_ + - second * MICRO_SECONDS_PRE_SEC)); + second * MICRO_SECONDS_PER_SEC)); } const Date Date::roundSecond() const { return Date(microSecondsSinceEpoch_ - - (microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC)); + (microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC)); } const Date Date::roundDay() const { struct tm t; time_t seconds = - static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC); #ifndef _WIN32 localtime_r(&seconds, &t); #else @@ -86,12 +86,12 @@ const Date Date::roundDay() const t.tm_hour = 0; t.tm_min = 0; t.tm_sec = 0; - return Date(mktime(&t) * MICRO_SECONDS_PRE_SEC); + return Date(mktime(&t) * MICRO_SECONDS_PER_SEC); } struct tm Date::tmStruct() const { time_t seconds = - static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC); struct tm tm_time; #ifndef _WIN32 gmtime_r(&seconds, &tm_time); @@ -105,7 +105,7 @@ std::string Date::toFormattedString(bool showMicroseconds) const // std::cout<<"toFormattedString"<(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC); struct tm tm_time; #ifndef _WIN32 gmtime_r(&seconds, &tm_time); @@ -116,7 +116,7 @@ std::string Date::toFormattedString(bool showMicroseconds) const if (showMicroseconds) { int microseconds = - static_cast(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC); snprintf(buf, sizeof(buf), "%4d%02d%02d %02d:%02d:%02d.%06d", @@ -147,7 +147,7 @@ std::string Date::toCustomFormattedString(const std::string &fmtStr, { char buf[256] = {0}; time_t seconds = - static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC); struct tm tm_time; #ifndef _WIN32 gmtime_r(&seconds, &tm_time); @@ -159,7 +159,7 @@ std::string Date::toCustomFormattedString(const std::string &fmtStr, return std::string(buf); char decimals[12] = {0}; int microseconds = - static_cast(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC); snprintf(decimals, sizeof(decimals), ".%06d", microseconds); return std::string(buf) + decimals; } @@ -169,7 +169,7 @@ void Date::toCustomFormattedString(const std::string &fmtStr, { // not safe time_t seconds = - static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC); struct tm tm_time; #ifndef _WIN32 gmtime_r(&seconds, &tm_time); @@ -183,7 +183,7 @@ std::string Date::toFormattedStringLocal(bool showMicroseconds) const // std::cout<<"toFormattedString"<(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC); struct tm tm_time; #ifndef _WIN32 localtime_r(&seconds, &tm_time); @@ -194,7 +194,7 @@ std::string Date::toFormattedStringLocal(bool showMicroseconds) const if (showMicroseconds) { int microseconds = - static_cast(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC); snprintf(buf, sizeof(buf), "%4d%02d%02d %02d:%02d:%02d.%06d", @@ -224,7 +224,7 @@ std::string Date::toDbStringLocal() const { char buf[128] = {0}; time_t seconds = - static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC); struct tm tm_time; #ifndef _WIN32 localtime_r(&seconds, &tm_time); @@ -232,11 +232,11 @@ std::string Date::toDbStringLocal() const localtime_s(&tm_time, &seconds); #endif bool showMicroseconds = - (microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC != 0); + (microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC != 0); if (showMicroseconds) { int microseconds = - static_cast(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC); snprintf(buf, sizeof(buf), "%4d-%02d-%02d %02d:%02d:%02d.%06d", @@ -328,7 +328,7 @@ std::string Date::toCustomFormattedStringLocal(const std::string &fmtStr, { char buf[256] = {0}; time_t seconds = - static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC); struct tm tm_time; #ifndef _WIN32 localtime_r(&seconds, &tm_time); @@ -340,7 +340,7 @@ std::string Date::toCustomFormattedStringLocal(const std::string &fmtStr, return std::string(buf); char decimals[12] = {0}; int microseconds = - static_cast(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC); + static_cast(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC); snprintf(decimals, sizeof(decimals), ".%06d", microseconds); return std::string(buf) + decimals; } @@ -364,7 +364,7 @@ Date::Date(unsigned int year, tm.tm_sec = second; epoch = mktime(&tm); microSecondsSinceEpoch_ = - static_cast(epoch) * MICRO_SECONDS_PRE_SEC + microSecond; + static_cast(epoch) * MICRO_SECONDS_PER_SEC + microSecond; } } // namespace trantor diff --git a/trantor/utils/Date.h b/trantor/utils/Date.h index 4b1c8e60..c7899588 100644 --- a/trantor/utils/Date.h +++ b/trantor/utils/Date.h @@ -18,7 +18,7 @@ #include #include -#define MICRO_SECONDS_PRE_SEC 1000000LL +#define MICRO_SECONDS_PER_SEC 1000000LL namespace trantor { @@ -183,7 +183,7 @@ class TRANTOR_EXPORT Date */ int64_t secondsSinceEpoch() const { - return microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC; + return microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC; } /** @@ -333,8 +333,8 @@ class TRANTOR_EXPORT Date */ bool isSameSecond(const Date &date) const { - return microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC == - date.microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC; + return microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC == + date.microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC; } /** From dd365c7860d85720e8874235c9552ec4c9e9624c Mon Sep 17 00:00:00 2001 From: naoto Date: Mon, 15 Sep 2025 16:58:39 +0900 Subject: [PATCH 2/2] use static constexpr --- trantor/utils/Date.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trantor/utils/Date.h b/trantor/utils/Date.h index c7899588..4684227d 100644 --- a/trantor/utils/Date.h +++ b/trantor/utils/Date.h @@ -18,8 +18,6 @@ #include #include -#define MICRO_SECONDS_PER_SEC 1000000LL - namespace trantor { /** @@ -347,6 +345,8 @@ class TRANTOR_EXPORT Date std::swap(microSecondsSinceEpoch_, that.microSecondsSinceEpoch_); } + static constexpr long MICRO_SECONDS_PER_SEC = 1000000LL; + private: int64_t microSecondsSinceEpoch_{0}; };