Skip to content

Commit c94b8cb

Browse files
FujiwaraNaotoFujiwaraNaoto
authored
Fix typo MICRO_SECONDS_PER_SEC (#378)
1 parent cc454e0 commit c94b8cb

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎trantor/utils/Date.cc‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,29 +55,29 @@ const Date Date::date()
5555
struct timeval tv;
5656
gettimeofday(&tv, NULL);
5757
int64_t seconds = tv.tv_sec;
58-
return Date(seconds * MICRO_SECONDS_PRE_SEC + tv.tv_usec);
58+
return Date(seconds * MICRO_SECONDS_PER_SEC + tv.tv_usec);
5959
#else
6060
timeval tv;
6161
gettimeofday(&tv, NULL);
6262
int64_t seconds = tv.tv_sec;
63-
return Date(seconds * MICRO_SECONDS_PRE_SEC + tv.tv_usec);
63+
return Date(seconds * MICRO_SECONDS_PER_SEC + tv.tv_usec);
6464
#endif
6565
}
6666
const Date Date::after(double second) const
6767
{
6868
return Date(static_cast<int64_t>(microSecondsSinceEpoch_ +
69-
second * MICRO_SECONDS_PRE_SEC));
69+
second * MICRO_SECONDS_PER_SEC));
7070
}
7171
const Date Date::roundSecond() const
7272
{
7373
return Date(microSecondsSinceEpoch_ -
74-
(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC));
74+
(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC));
7575
}
7676
const Date Date::roundDay() const
7777
{
7878
struct tm t;
7979
time_t seconds =
80-
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
80+
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
8181
#ifndef _WIN32
8282
localtime_r(&seconds, &t);
8383
#else
@@ -86,12 +86,12 @@ const Date Date::roundDay() const
8686
t.tm_hour = 0;
8787
t.tm_min = 0;
8888
t.tm_sec = 0;
89-
return Date(mktime(&t) * MICRO_SECONDS_PRE_SEC);
89+
return Date(mktime(&t) * MICRO_SECONDS_PER_SEC);
9090
}
9191
struct tm Date::tmStruct() const
9292
{
9393
time_t seconds =
94-
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
94+
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
9595
struct tm tm_time;
9696
#ifndef _WIN32
9797
gmtime_r(&seconds, &tm_time);
@@ -105,7 +105,7 @@ std::string Date::toFormattedString(bool showMicroseconds) const
105105
// std::cout<<"toFormattedString"<<std::endl;
106106
char buf[128] = {0};
107107
time_t seconds =
108-
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
108+
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
109109
struct tm tm_time;
110110
#ifndef _WIN32
111111
gmtime_r(&seconds, &tm_time);
@@ -116,7 +116,7 @@ std::string Date::toFormattedString(bool showMicroseconds) const
116116
if (showMicroseconds)
117117
{
118118
int microseconds =
119-
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC);
119+
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC);
120120
snprintf(buf,
121121
sizeof(buf),
122122
"%4d%02d%02d %02d:%02d:%02d.%06d",
@@ -147,7 +147,7 @@ std::string Date::toCustomFormattedString(const std::string &fmtStr,
147147
{
148148
char buf[256] = {0};
149149
time_t seconds =
150-
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
150+
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
151151
struct tm tm_time;
152152
#ifndef _WIN32
153153
gmtime_r(&seconds, &tm_time);
@@ -159,7 +159,7 @@ std::string Date::toCustomFormattedString(const std::string &fmtStr,
159159
return std::string(buf);
160160
char decimals[12] = {0};
161161
int microseconds =
162-
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC);
162+
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC);
163163
snprintf(decimals, sizeof(decimals), ".%06d", microseconds);
164164
return std::string(buf) + decimals;
165165
}
@@ -169,7 +169,7 @@ void Date::toCustomFormattedString(const std::string &fmtStr,
169169
{
170170
// not safe
171171
time_t seconds =
172-
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
172+
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
173173
struct tm tm_time;
174174
#ifndef _WIN32
175175
gmtime_r(&seconds, &tm_time);
@@ -183,7 +183,7 @@ std::string Date::toFormattedStringLocal(bool showMicroseconds) const
183183
// std::cout<<"toFormattedString"<<std::endl;
184184
char buf[128] = {0};
185185
time_t seconds =
186-
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
186+
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
187187
struct tm tm_time;
188188
#ifndef _WIN32
189189
localtime_r(&seconds, &tm_time);
@@ -194,7 +194,7 @@ std::string Date::toFormattedStringLocal(bool showMicroseconds) const
194194
if (showMicroseconds)
195195
{
196196
int microseconds =
197-
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC);
197+
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC);
198198
snprintf(buf,
199199
sizeof(buf),
200200
"%4d%02d%02d %02d:%02d:%02d.%06d",
@@ -224,19 +224,19 @@ std::string Date::toDbStringLocal() const
224224
{
225225
char buf[128] = {0};
226226
time_t seconds =
227-
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
227+
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
228228
struct tm tm_time;
229229
#ifndef _WIN32
230230
localtime_r(&seconds, &tm_time);
231231
#else
232232
localtime_s(&tm_time, &seconds);
233233
#endif
234234
bool showMicroseconds =
235-
(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC != 0);
235+
(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC != 0);
236236
if (showMicroseconds)
237237
{
238238
int microseconds =
239-
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC);
239+
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC);
240240
snprintf(buf,
241241
sizeof(buf),
242242
"%4d-%02d-%02d %02d:%02d:%02d.%06d",
@@ -360,7 +360,7 @@ std::string Date::toCustomFormattedStringLocal(const std::string &fmtStr,
360360
{
361361
char buf[256] = {0};
362362
time_t seconds =
363-
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC);
363+
static_cast<time_t>(microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC);
364364
struct tm tm_time;
365365
#ifndef _WIN32
366366
localtime_r(&seconds, &tm_time);
@@ -372,7 +372,7 @@ std::string Date::toCustomFormattedStringLocal(const std::string &fmtStr,
372372
return std::string(buf);
373373
char decimals[12] = {0};
374374
int microseconds =
375-
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PRE_SEC);
375+
static_cast<int>(microSecondsSinceEpoch_ % MICRO_SECONDS_PER_SEC);
376376
snprintf(decimals, sizeof(decimals), ".%06d", microseconds);
377377
return std::string(buf) + decimals;
378378
}
@@ -396,7 +396,7 @@ Date::Date(unsigned int year,
396396
tm.tm_sec = second;
397397
epoch = mktime(&tm);
398398
microSecondsSinceEpoch_ =
399-
static_cast<int64_t>(epoch) * MICRO_SECONDS_PRE_SEC + microSecond;
399+
static_cast<int64_t>(epoch) * MICRO_SECONDS_PER_SEC + microSecond;
400400
}
401401

402402
} // namespace trantor

‎trantor/utils/Date.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
#include <stdint.h>
1919
#include <string>
2020

21-
#define MICRO_SECONDS_PRE_SEC 1000000LL
22-
2321
namespace trantor
2422
{
2523
/**
@@ -183,7 +181,7 @@ class TRANTOR_EXPORT Date
183181
*/
184182
int64_t secondsSinceEpoch() const
185183
{
186-
return microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC;
184+
return microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC;
187185
}
188186

189187
/**
@@ -333,8 +331,8 @@ class TRANTOR_EXPORT Date
333331
*/
334332
bool isSameSecond(const Date &date) const
335333
{
336-
return microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC ==
337-
date.microSecondsSinceEpoch_ / MICRO_SECONDS_PRE_SEC;
334+
return microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC ==
335+
date.microSecondsSinceEpoch_ / MICRO_SECONDS_PER_SEC;
338336
}
339337

340338
/**
@@ -347,6 +345,8 @@ class TRANTOR_EXPORT Date
347345
std::swap(microSecondsSinceEpoch_, that.microSecondsSinceEpoch_);
348346
}
349347

348+
static constexpr long MICRO_SECONDS_PER_SEC = 1000000LL;
349+
350350
private:
351351
int64_t microSecondsSinceEpoch_{0};
352352
};

0 commit comments

Comments
 (0)