Skip to content

Fix typo MICRO_SECONDS_PER_SEC #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2025
Merged

Fix typo MICRO_SECONDS_PER_SEC #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5320996
fix type miss
FujiwaraNaoto Sep 15, 2025
dd365c7
use static constexpr
FujiwaraNaoto Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions trantor/utils/Date.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<int64_t>(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<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
#ifndef _WIN32
localtime_r(&seconds, &t);
#else
Expand All @@ -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<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
struct tm tm_time;
#ifndef _WIN32
gmtime_r(&seconds, &tm_time);
Expand All @@ -105,7 +105,7 @@ std::string Date::toFormattedString(bool showMicroseconds) const
// std::cout<<"toFormattedString"<<std::endl;
char buf[128] = {0};
time_t seconds =
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
struct tm tm_time;
#ifndef _WIN32
gmtime_r(&seconds, &tm_time);
Expand All @@ -116,7 +116,7 @@ std::string Date::toFormattedString(bool showMicroseconds) const
if (showMicroseconds)
{
int microseconds =
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC);
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC);
snprintf(buf,
sizeof(buf),
"%4d%02d%02d %02d:%02d:%02d.%06d",
Expand Down Expand Up @@ -147,7 +147,7 @@ std::string Date::toCustomFormattedString(const std::string &fmtStr,
{
char buf[256] = {0};
time_t seconds =
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
struct tm tm_time;
#ifndef _WIN32
gmtime_r(&seconds, &tm_time);
Expand All @@ -159,7 +159,7 @@ std::string Date::toCustomFormattedString(const std::string &fmtStr,
return std::string(buf);
char decimals[12] = {0};
int microseconds =
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC);
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC);
snprintf(decimals, sizeof(decimals), ".%06d", microseconds);
return std::string(buf) + decimals;
}
Expand All @@ -169,7 +169,7 @@ void Date::toCustomFormattedString(const std::string &fmtStr,
{
// not safe
time_t seconds =
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
struct tm tm_time;
#ifndef _WIN32
gmtime_r(&seconds, &tm_time);
Expand All @@ -183,7 +183,7 @@ std::string Date::toFormattedStringLocal(bool showMicroseconds) const
// std::cout<<"toFormattedString"<<std::endl;
char buf[128] = {0};
time_t seconds =
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
struct tm tm_time;
#ifndef _WIN32
localtime_r(&seconds, &tm_time);
Expand All @@ -194,7 +194,7 @@ std::string Date::toFormattedStringLocal(bool showMicroseconds) const
if (showMicroseconds)
{
int microseconds =
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC);
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC);
snprintf(buf,
sizeof(buf),
"%4d%02d%02d %02d:%02d:%02d.%06d",
Expand Down Expand Up @@ -224,19 +224,19 @@ std::string Date::toDbStringLocal() const
{
char buf[128] = {0};
time_t seconds =
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
struct tm tm_time;
#ifndef _WIN32
localtime_r(&seconds, &tm_time);
#else
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<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC);
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC);
snprintf(buf,
sizeof(buf),
"%4d-%02d-%02d %02d:%02d:%02d.%06d",
Expand Down Expand Up @@ -328,7 +328,7 @@ std::string Date::toCustomFormattedStringLocal(const std::string &fmtStr,
{
char buf[256] = {0};
time_t seconds =
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
struct tm tm_time;
#ifndef _WIN32
localtime_r(&seconds, &tm_time);
Expand All @@ -340,7 +340,7 @@ std::string Date::toCustomFormattedStringLocal(const std::string &fmtStr,
return std::string(buf);
char decimals[12] = {0};
int microseconds =
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC);
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC);
snprintf(decimals, sizeof(decimals), ".%06d", microseconds);
return std::string(buf) + decimals;
}
Expand All @@ -364,7 +364,7 @@ Date::Date(unsigned int year,
tm.tm_sec = second;
epoch = mktime(&tm);
microSecondsSinceEpoch_ =
static_cast<int64_t>(epoch) * MICRO_SECONDS_PRE_SEC + microSecond;
static_cast<int64_t>(epoch) * MICRO_SECONDS_PER_SEC + microSecond;
}

} // namespace trantor
10 changes: 5 additions & 5 deletions trantor/utils/Date.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
#include <stdint.h>
#include <string>

#define MICRO_SECONDS_PRE_SEC 1000000LL

namespace trantor
{
/**
Expand Down Expand Up @@ -183,7 +181,7 @@ class TRANTOR_EXPORT Date
*/
int64_t secondsSinceEpoch() const
{
return microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC;
return microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC;
}

/**
Expand Down Expand Up @@ -333,8 +331,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;
}

/**
Expand All @@ -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};
};
Expand Down
Loading