Skip to content
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

More human readable elapsed time #857

Closed
wants to merge 6 commits into from
Closed

More human readable elapsed time #857

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f6f48c
More humand readable elapsed time
xiaozhuai Jan 12, 2023
0e17776
use auto type
xiaozhuai Jan 12, 2023
1f87f8a
always print seconds
xiaozhuai Jan 12, 2023
7e48158
Add delimiter between tokens
xiaozhuai Jan 12, 2023
312c351
Allow specify delimiter and default to ' '
xiaozhuai Jan 12, 2023
8b26c38
Format code
xiaozhuai Jan 13, 2023
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
48 changes: 25 additions & 23 deletions src/vcpkg/base/chrono.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,49 +58,51 @@ namespace vcpkg
return to_utc_time(date_in_seconds).value_or_exit(VCPKG_LINE_INFO);
}

static std::string format_time_userfriendly(const std::chrono::nanoseconds& nanos)
static std::string format_time_userfriendly(const std::chrono::nanoseconds& nanos, StringLiteral delimiter = " ")
{
using std::chrono::duration_cast;
using std::chrono::hours;
using std::chrono::microseconds;
using std::chrono::milliseconds;
using std::chrono::minutes;
using std::chrono::nanoseconds;
using std::chrono::seconds;

const auto nanos_as_double = static_cast<double>(nanos.count());
auto ns_total = nanos.count();

if (duration_cast<hours>(nanos) > hours())
{
const auto t = nanos_as_double / duration_cast<nanoseconds>(hours(1)).count();
return Strings::format("%.4g h", t);
}
std::vector<std::string> tokens;

if (duration_cast<minutes>(nanos) > minutes())
const auto one_day_ns = duration_cast<nanoseconds>(hours(24)).count();
if (ns_total >= one_day_ns)
{
const auto t = nanos_as_double / duration_cast<nanoseconds>(minutes(1)).count();
return Strings::format("%.4g min", t);
const auto d = ns_total / one_day_ns;
ns_total %= one_day_ns;
if (d != 0) tokens.emplace_back(Strings::format("%dd", d));
}

if (duration_cast<seconds>(nanos) > seconds())
const auto one_hour_ns = duration_cast<nanoseconds>(hours(1)).count();
if (ns_total >= one_hour_ns)
{
const auto t = nanos_as_double / duration_cast<nanoseconds>(seconds(1)).count();
return Strings::format("%.4g s", t);
const auto h = ns_total / one_hour_ns;
ns_total %= one_hour_ns;
if (h != 0) tokens.emplace_back(Strings::format("%dh", h));
}

if (duration_cast<milliseconds>(nanos) > milliseconds())
const auto one_minute_ns = duration_cast<nanoseconds>(minutes(1)).count();
if (ns_total >= one_minute_ns)
{
const auto t = nanos_as_double / duration_cast<nanoseconds>(milliseconds(1)).count();
return Strings::format("%.4g ms", t);
const auto m = ns_total / one_minute_ns;
ns_total %= one_minute_ns;
if (m != 0) tokens.emplace_back(Strings::format("%dm", m));
}

if (duration_cast<microseconds>(nanos) > microseconds())
{
const auto t = nanos_as_double / duration_cast<nanoseconds>(microseconds(1)).count();
return Strings::format("%.4g us", t);
}
const auto one_second_ns = duration_cast<nanoseconds>(seconds(1)).count();
const auto one_millisecond_ns = duration_cast<nanoseconds>(milliseconds(1)).count();
const auto s = ns_total / one_second_ns;
ns_total %= one_second_ns;
const auto ms = ns_total / one_millisecond_ns;
tokens.emplace_back(Strings::format("%d.%03ds", s, ms));

return Strings::format("%.4g ns", nanos_as_double);
return Strings::join(delimiter, tokens);
}

ElapsedTimer::ElapsedTimer() noexcept
Expand Down