Skip to content

Fix date_time_with_ms millisecond formatting #570

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

Open
ahuazuipiaoliang wants to merge 1 commit into
base: rolling
Choose a base branch
from
+9 −9
Open

Fix date_time_with_ms millisecond formatting #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions src/time.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,7 @@ rcutils_time_point_value_as_date_string(
// break into two parts to avoid floating point error
uint64_t seconds = abs_time_point / (1000u * 1000u * 1000u);
uint64_t nanoseconds = abs_time_point % (1000u * 1000u * 1000u);
// Make sure the buffer is large enough to hold the largest possible uint64_t
char nanoseconds_str[21];

if (rcutils_snprintf(nanoseconds_str, sizeof(nanoseconds_str), "%" PRIu64, nanoseconds) < 0) {
RCUTILS_SET_ERROR_MSG("failed to format time point nanoseconds into string");
return RCUTILS_RET_ERROR;
}
uint64_t milliseconds = nanoseconds / (1000u * 1000u);

time_t now_t = (time_t)(seconds);
struct tm ptm = {.tm_year = 0, .tm_mday = 0};
Expand All @@ -91,8 +85,8 @@ rcutils_time_point_value_as_date_string(
}
static const int date_end_position = 19;
if (rcutils_snprintf(
&str[date_end_position], str_size - date_end_position, ".%.3s",
nanoseconds_str) < 0)
&str[date_end_position], str_size - date_end_position, ".%03" PRIu64,
milliseconds) < 0)
{
RCUTILS_SET_ERROR_MSG("failed to format time point into string as date_time_with_ms");
return RCUTILS_RET_ERROR;
Expand Down
6 changes: 6 additions & 0 deletions test/test_time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,12 @@ TEST_F(TestTimeFixture, test_rcutils_time_point_value_as_date_string) {
ss2 >> std::get_time(&t, "%Y-%b-%d %H:%M:%S");
ASSERT_TRUE(ss2.fail());

// Subsecond values should be formatted as milliseconds, including leading zeros.
timepoint = RCUTILS_S_TO_NS(1) + RCUTILS_MS_TO_NS(85) + RCUTILS_US_TO_NS(860);
ret = rcutils_time_point_value_as_date_string(&timepoint, buffer, sizeof(buffer));
EXPECT_EQ(RCUTILS_RET_OK, ret) << rcutils_get_error_string().str;
EXPECT_STREQ(".085", buffer + 19);

// nullptr for timepoint
ret = rcutils_time_point_value_as_date_string(nullptr, buffer, sizeof(buffer));
EXPECT_EQ(RCUTILS_RET_INVALID_ARGUMENT, ret);
Expand Down