Skip to content

Commit 39eb780

Browse files
authored
Update the trantor library (#2430)
1 parent 14976c1 commit 39eb780

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

lib/src/HttpResponseImpl.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -649,13 +649,13 @@ std::shared_ptr<trantor::MsgBuffer> HttpResponseImpl::renderToBuffer()
649649
{
650650
auto now = trantor::Date::now();
651651
bool isDateChanged =
652-
((now.microSecondsSinceEpoch() / MICRO_SECONDS_PRE_SEC) !=
653-
httpStringDate_);
652+
((now.microSecondsSinceEpoch() /
653+
trantor::Date::MICRO_SECONDS_PER_SEC) != httpStringDate_);
654654
assert(httpString_);
655655
if (isDateChanged)
656656
{
657-
httpStringDate_ =
658-
now.microSecondsSinceEpoch() / MICRO_SECONDS_PRE_SEC;
657+
httpStringDate_ = now.microSecondsSinceEpoch() /
658+
trantor::Date::MICRO_SECONDS_PER_SEC;
659659
auto newDate = utils::getHttpFullDate(now);
660660

661661
httpString_ =

lib/src/Utilities.cc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,8 @@ char *getHttpFullDate(const trantor::Date &date)
10221022
{
10231023
static thread_local int64_t lastSecond = 0;
10241024
static thread_local char lastTimeString[128] = {0};
1025-
auto nowSecond = date.microSecondsSinceEpoch() / MICRO_SECONDS_PRE_SEC;
1025+
auto nowSecond =
1026+
date.microSecondsSinceEpoch() / trantor::Date::MICRO_SECONDS_PER_SEC;
10261027
if (nowSecond == lastSecond)
10271028
{
10281029
return lastTimeString;
@@ -1038,7 +1039,8 @@ void dateToCustomFormattedString(const std::string &fmtStr,
10381039
std::string &str,
10391040
const trantor::Date &date)
10401041
{
1041-
auto nowSecond = date.microSecondsSinceEpoch() / MICRO_SECONDS_PRE_SEC;
1042+
auto nowSecond =
1043+
date.microSecondsSinceEpoch() / trantor::Date::MICRO_SECONDS_PER_SEC;
10421044
struct tm tm_LValue = date.tmStruct();
10431045
std::stringstream Out;
10441046
Out.imbue(std::locale{"C"});
@@ -1050,7 +1052,8 @@ const std::string &getHttpFullDateStr(const trantor::Date &date)
10501052
{
10511053
static thread_local int64_t lastSecond = 0;
10521054
static thread_local std::string lastTimeString(128, 0);
1053-
auto nowSecond = date.microSecondsSinceEpoch() / MICRO_SECONDS_PRE_SEC;
1055+
auto nowSecond =
1056+
date.microSecondsSinceEpoch() / trantor::Date::MICRO_SECONDS_PER_SEC;
10541057
if (nowSecond == lastSecond)
10551058
{
10561059
return lastTimeString;
@@ -1080,7 +1083,7 @@ trantor::Date getHttpDate(const std::string &httpFullDateString)
10801083
if (strptime(httpFullDateString.c_str(), format, &tmptm) != NULL)
10811084
{
10821085
auto epoch = timegm(&tmptm);
1083-
return trantor::Date(epoch * MICRO_SECONDS_PRE_SEC);
1086+
return trantor::Date(epoch * trantor::Date::MICRO_SECONDS_PER_SEC);
10841087
}
10851088
}
10861089
LOG_WARN << "invalid datetime format: '" << httpFullDateString << "'";

lib/tests/unittests/HttpDateTest.cc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@ DROGON_TEST(HttpDate)
66
{
77
// RFC 850
88
auto date = utils::getHttpDate("Fri, 05-Jun-20 09:19:38 GMT");
9-
CHECK(date.microSecondsSinceEpoch() / MICRO_SECONDS_PRE_SEC == 1591348778);
9+
CHECK(date.microSecondsSinceEpoch() /
10+
trantor::Date::MICRO_SECONDS_PER_SEC ==
11+
1591348778);
1012

1113
// Reddit format
1214
date = utils::getHttpDate("Fri, 05-Jun-2020 09:19:38 GMT");
13-
CHECK(date.microSecondsSinceEpoch() / MICRO_SECONDS_PRE_SEC == 1591348778);
15+
CHECK(date.microSecondsSinceEpoch() /
16+
trantor::Date::MICRO_SECONDS_PER_SEC ==
17+
1591348778);
1418

1519
// Invalid
1620
date = utils::getHttpDate("Fri, this format is invalid");
@@ -20,5 +24,7 @@ DROGON_TEST(HttpDate)
2024
auto epoch = time(nullptr);
2125
auto str = asctime(gmtime(&epoch));
2226
date = utils::getHttpDate(str);
23-
CHECK(date.microSecondsSinceEpoch() / MICRO_SECONDS_PRE_SEC == epoch);
27+
CHECK(date.microSecondsSinceEpoch() /
28+
trantor::Date::MICRO_SECONDS_PER_SEC ==
29+
epoch);
2430
}

0 commit comments

Comments
 (0)