Skip to content

Use clock_gettime on all MacOS after 10.11 #2341

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

Merged
dmah42 merged 4 commits into from
Oct 20, 2026
+1 −28
Merged

Use clock_gettime on all MacOS after 10.11 #2341

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ed8b4e
Use `clock_gettime` on all MacOS after 10.11
nicholasjng Oct 19, 2026
e7332a3
Drop ThreadCPUUsage() branch for macOS<10.12
nicholasjng Oct 19, 2026
e566a10
Remove macOS-specific includes, mach-specific MakeTime() overload
nicholasjng Oct 19, 2026
92034a1
Merge branch 'main' into push-pzxxlxstmtmy
dmah42 Oct 20, 2026
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
29 changes: 1 addition & 28 deletions src/timers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@
defined BENCHMARK_OS_MACOSX
#include <sys/sysctl.h>
#endif
#if defined(BENCHMARK_OS_MACOSX)
#include <mach/mach_init.h>
#include <mach/mach_port.h>
#include <mach/thread_act.h>
#endif
#if defined(BENCHMARK_OS_QURT)
#include <qurt.h>
#endif
Expand Down Expand Up @@ -94,14 +89,6 @@ double MakeTime(struct rusage const& ru) {
static_cast<double>(ru.ru_stime.tv_usec) * 1e-6);
}
#endif
#if defined(BENCHMARK_OS_MACOSX)
double MakeTime(thread_basic_info_data_t const& info) {
return (static_cast<double>(info.user_time.seconds) +
static_cast<double>(info.user_time.microseconds) * 1e-6 +
static_cast<double>(info.system_time.seconds) +
static_cast<double>(info.system_time.microseconds) * 1e-6);
}
#endif
#if defined(CLOCK_PROCESS_CPUTIME_ID) || defined(CLOCK_THREAD_CPUTIME_ID)
double MakeTime(struct timespec const& ts) {
return static_cast<double>(ts.tv_sec) +
Expand Down Expand Up @@ -150,9 +137,7 @@ double ProcessCPUUsage() {
(static_cast<double>(ts.tv_nsec) * 1e-9);
}
DiagnoseAndExit("clock_gettime(CLOCK_MONOTONIC, ...) failed");
#elif defined(CLOCK_PROCESS_CPUTIME_ID) && !defined(BENCHMARK_OS_MACOSX)
// FIXME We want to use clock_gettime, but its not available in MacOS 10.11.
// See https://github.com/google/benchmark/pull/292
#elif defined(CLOCK_PROCESS_CPUTIME_ID)
struct timespec spec {};
if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &spec) == 0) {
return MakeTime(spec);
Expand Down Expand Up @@ -183,18 +168,6 @@ double ThreadCPUUsage() {
return static_cast<double>(
qurt_timer_timetick_to_us(qurt_sysclock_get_hw_ticks())) *
1.0e-6;
#elif defined(BENCHMARK_OS_MACOSX)
// FIXME We want to use clock_gettime, but its not available in MacOS 10.11.
// See https://github.com/google/benchmark/pull/292
mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
thread_basic_info_data_t info;
mach_port_t thread = pthread_mach_thread_np(pthread_self());
if (thread_info(thread, THREAD_BASIC_INFO,
reinterpret_cast<thread_info_t>(&info),
&count) == KERN_SUCCESS) {
return MakeTime(info);
}
DiagnoseAndExit("ThreadCPUUsage() failed when evaluating thread_info");
#elif defined(BENCHMARK_OS_EMSCRIPTEN)
// Emscripten doesn't support traditional threads
return ProcessCPUUsage();
Expand Down
Loading