Skip to content

[wasm] Use monotonic clock in wasm, emscripten has it now #85660

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
kg merged 3 commits into from
May 3, 2023
Merged

[wasm] Use monotonic clock in wasm, emscripten has it now #85660

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfc9054
Use monotonic clock in wasm, emscripten has it now
kg Apr 14, 2023
a5cb053
Update mono-os-mutex.h
kg May 2, 2023
0769e37
Maybe fix wasi build
kg May 3, 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
2 changes: 1 addition & 1 deletion src/mono/mono/utils/mono-os-mutex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#if !defined(HOST_WIN32)

#if !defined(CLOCK_MONOTONIC) || defined(HOST_DARWIN) || defined(HOST_WASM)
#if !defined(CLOCK_MONOTONIC) || defined(HOST_DARWIN)
#define BROKEN_CLOCK_SOURCE
#endif

Expand Down
5 changes: 3 additions & 2 deletions src/mono/mono/utils/mono-time.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,10 @@ gint64
mono_msec_boottime (void)
{
/* clock_gettime () is found by configure on Apple builds, but its only present from ios 10, macos 10.12, tvos 10 and watchos 3 */
#if !defined (TARGET_WASM) && ((defined(HAVE_CLOCK_MONOTONIC_COARSE) || defined(HAVE_CLOCK_MONOTONIC)) && !(defined(TARGET_IOS) || defined(TARGET_OSX) || defined(TARGET_WATCHOS) || defined(TARGET_TVOS)))
#if ((defined(HAVE_CLOCK_MONOTONIC_COARSE) || defined(HAVE_CLOCK_MONOTONIC)) && !(defined(TARGET_IOS) || defined(TARGET_OSX) || defined(TARGET_WATCHOS) || defined(TARGET_TVOS)))
clockid_t clockType =
#if HAVE_CLOCK_MONOTONIC_COARSE
/* emscripten exposes CLOCK_MONOTONIC_COARSE but doesn't implement it */
#if defined(HAVE_CLOCK_MONOTONIC_COARSE) && !defined(TARGET_WASM)
CLOCK_MONOTONIC_COARSE; /* good enough resolution, fastest speed */
#else
CLOCK_MONOTONIC;
Expand Down