Skip to content
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.

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

Use 64 bits for time_t #17401

Merged
merged 2 commits into from
Jul 8, 2022
Merged

Use 64 bits for time_t #17401

merged 2 commits into from
Jul 8, 2022

Conversation

sbc100
Copy link
Collaborator

@sbc100 sbc100 commented Jul 8, 2022

This brings us back in line with upstream musl. The change to 32-bit
was only recently made in #16966. The reason we made this change was
made was because we had certain C library calls that were implemented in
JS that returned time_t. Since returning 64-bit values from JS
functions is not always easy (we don't always have WASM_BIGINT
available) that simplest solution was to define time_t to 32-bit which
doesn't have issues at the JS boundary.

However, in the intervening time many of the time_t-returning function
have been moved into native code (See #16606 and #16439) with only two
remaining: _mktime_js and _timegm_js. So this change redefines just
those two functions to return int while keeping time_t itself as
64-bit.

Fixes: #17393

@sbc100 sbc100 requested a review from kripken July 8, 2022 18:09
Copy link
Member

@kripken kripken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we mention this in the changelog? The type change is user-visible and people might need changes as in those tests changed in this PR?

system/lib/libc/emscripten_time.c Show resolved Hide resolved
@sbc100 sbc100 force-pushed the restore_64bit_time_t branch from 15da934 to cd78df6 Compare July 8, 2022 19:05
@sbc100 sbc100 changed the title Restore time_t and other core types to 64bit Restore time_t to 64bit Jul 8, 2022
@sbc100 sbc100 force-pushed the restore_64bit_time_t branch from cd78df6 to c0b6ba6 Compare July 8, 2022 19:14
This brings us back in line with upstream musl.  The change to 32-bit
was only recently made in #16966. The reason we made this change was
made was because we had certain C library calls that were implemented in
JS that returned `time_t`.  Since returning 64-bit values from JS
functions is not always easy (we don't always have WASM_BIGINT
available) that simplest solution was to define `time_t` to 32-bit which
doesn't have issues at the JS boundary.

However, in the intervening time many of the `time_t`-returning function
have been moved into native code (See #16606 and #16439) with only two
remaining: _mktime_js and _timegm_js.  So this change redefines just
those two functions to return `int` while keeping `time_t` itself as
64-bit.

Fixes: #17393
@sbc100 sbc100 force-pushed the restore_64bit_time_t branch from c0b6ba6 to 8ae0b3e Compare July 8, 2022 19:16
@sbc100 sbc100 changed the title Restore time_t to 64bit Use 64 bits for time_t Jul 8, 2022
@sbc100 sbc100 merged commit c8857a6 into main Jul 8, 2022
@sbc100 sbc100 deleted the restore_64bit_time_t branch July 8, 2022 20:28
@hoodmane
Copy link
Collaborator

hoodmane commented Jul 8, 2022

Thanks!

xbcnn pushed a commit to xbcnn/emscripten that referenced this pull request Jul 22, 2022
This brings us back in line with upstream musl.  The change to 32-bit
was only recently made in emscripten-core#16966. The reason we made this change was
made was because we had certain C library calls that were implemented in
JS that returned `time_t`.  Since returning 64-bit values from JS
functions is not always easy (we don't always have WASM_BIGINT
available) that simplest solution was to define `time_t` to 32-bit which
doesn't have issues at the JS boundary.

However, in the intervening time many of the `time_t`-returning function
have been moved into native code (See emscripten-core#16606 and emscripten-core#16439) with only two
remaining: _mktime_js and _timegm_js.  So this change redefines just
those two functions to return `int` while keeping `time_t` itself as
64-bit.

Fixes: emscripten-core#17393
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

64 bit time_t
3 participants