From 848f7b0a81b09ef7fa73e842222e969ecab5e8c2 Mon Sep 17 00:00:00 2001 From: scivision Date: Wed, 15 Feb 2023 08:54:02 -0500 Subject: [PATCH] cmake -E time: use C++11 chrono and better format output fixes #24415 --- Source/cmcmd.cxx | 24 ++++---------------- Tests/RunCMake/CommandLine/E_time-stdout.txt | 2 +- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 21d0cc935c..d57b78b025 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -50,10 +50,10 @@ #endif #include +#include #include #include #include -#include #include #include #include @@ -1104,27 +1104,13 @@ int cmcmd::ExecuteCMakeCommand(std::vector const& args, if (args[1] == "time" && args.size() > 2) { std::vector command(args.begin() + 2, args.end()); - clock_t clock_start; - clock_t clock_finish; - time_t time_start; - time_t time_finish; - - time(&time_start); - clock_start = clock(); int ret = 0; + auto time_start = std::chrono::steady_clock::now(); cmSystemTools::RunSingleCommand(command, nullptr, nullptr, &ret); + auto time_finish = std::chrono::steady_clock::now(); - clock_finish = clock(); - time(&time_finish); - - double clocks_per_sec = static_cast(CLOCKS_PER_SEC); - std::cout << "Elapsed time: " - << static_cast(time_finish - time_start) << " s. (time)" - << ", " - << static_cast(clock_finish - clock_start) / - clocks_per_sec - << " s. (clock)" - << "\n"; + std::chrono::duration time_elapsed = time_finish - time_start; + std::cout << "Elapsed time (seconds): " << time_elapsed.count() << "\n"; return ret; } diff --git a/Tests/RunCMake/CommandLine/E_time-stdout.txt b/Tests/RunCMake/CommandLine/E_time-stdout.txt index a51446a67e..1a5e13479b 100644 --- a/Tests/RunCMake/CommandLine/E_time-stdout.txt +++ b/Tests/RunCMake/CommandLine/E_time-stdout.txt @@ -1,3 +1,3 @@ ^hello world -Elapsed time: [^ +Elapsed time \(seconds\): [^ ]*$