Attachment 372837 Details for Bug 199191 – Patch

[patch] Patch

bug-199191-20190625084929.patch (text/plain), 1.99 KB, created by Adam Barth on 2019-06-25 08:49:30 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Barth

Created: 2019-06-25 08:49:30 PDT

Size: 1.99 KB

patch

obsolete

>Subversion Revision: 246791
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 6f66c333601d78458128bf98c033533d3c11b2ff..9c99d92544cbb353bdf1f4f40da8fc3ea51940dc 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-06-25  Adam Barth  <abarth@google.com>
>+
>+        [fuchsia] Update to newer zx_clock_get syscall
>+        https://bugs.webkit.org/show_bug.cgi?id=199191
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+	Fuchsia has changed the zx_clock_get syscall to return the clock value
>+	via an out parameter rather than via its return value. This change
>+	makes zx_clock_get consistent with all the other syscalls.
>+
>+	This patch updates our use of zx_clock_get to use the new syscall. The
>+	old syscall is no longer supported by Fuchsia.
>+
>+        * wtf/fuchsia/CPUTimeFuchsia.cpp:
>+        (WTF::CPUTime::get): Switch to using the out parameter.
>+        (WTF::CPUTime::forCurrentThread): Switch to using the out parameter.
>+
> 2019-06-25  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Fully rename WebKitGTK+ -> WebKitGTK everywhere
>diff --git a/Source/WTF/wtf/fuchsia/CPUTimeFuchsia.cpp b/Source/WTF/wtf/fuchsia/CPUTimeFuchsia.cpp
>index 81d8e2cacf64bb65e6cbe45729a8c3a154475d52..7e773161248fce56460cf27ce95cecfc258327a1 100644
>--- a/Source/WTF/wtf/fuchsia/CPUTimeFuchsia.cpp
>+++ b/Source/WTF/wtf/fuchsia/CPUTimeFuchsia.cpp
>@@ -41,14 +41,17 @@ Optional<CPUTime> CPUTime::get()
>     // Fuchsia issue ZX-2318 tracks being able to get the monotonic and thread
>     // times atomically and being able to separate ZX_CLOCK_THREAD into user and
>     // kernel time.
>-    zx_time_t thread = zx_clock_get(ZX_CLOCK_THREAD);
>+    zx_time_t thread = 0;
>+    zx_clock_get(ZX_CLOCK_THREAD, &thread);
> 
>     return CPUTime { MonotonicTime::now(), timeToSeconds(thread), Seconds() };
> }
> 
> Seconds CPUTime::forCurrentThread()
> {
>-    return timeToSeconds(zx_clock_get(ZX_CLOCK_THREAD));
>+    zx_time_t thread = 0;
>+    zx_clock_get(ZX_CLOCK_THREAD, &thread)
>+    return timeToSeconds(thread);
> }
> 
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 199191: 372837 | 372838