diff options
Diffstat (limited to 'www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc')
| -rw-r--r-- | www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc index 2f60feac6aac..4376cbccdf35 100644 --- a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc +++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc @@ -1,24 +1,18 @@ ---- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2021-04-14 18:41:08 UTC +--- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2021-06-14 15:19:11 UTC +++ services/tracing/public/cpp/perfetto/trace_time.cc -@@ -12,14 +12,18 @@ namespace tracing { +@@ -12,10 +12,14 @@ namespace tracing { int64_t TraceBootTicksNow() { // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already. -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ ++#if defined(OS_BSD) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ defined(OS_FUCHSIA) struct timespec ts; -+ int res = clock_gettime(CLOCK_UPTIME, &ts); +#if defined(OS_BSD) ++ int res = clock_gettime(CLOCK_MONOTONIC, &ts); +#else int res = clock_gettime(CLOCK_BOOTTIME, &ts); +#endif if (res != -1) return static_cast<int64_t>(perfetto::base::FromPosixTimespec(ts).count()); #endif - return TRACE_TIME_TICKS_NOW().since_origin().InNanoseconds(); - } - --} // namespace tracing -\ No newline at end of file -+} // namespace tracing |