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

Make domain state the same in bytecode and native mode #678

Merged
merged 1 commit into from
Oct 11, 2021

Conversation

ctk21
Copy link
Collaborator

@ctk21 ctk21 commented Oct 8, 2021

This PR makes struct domain_state the same in both bytecode and native code.

In the past, there was a caml/byte_domain_state.tbl which separated the additional bytecode domain state variables from those needed in native mode. ocaml/ocaml#10595 introduced an extra_params variable that must be at the end of the structure. In the recent multicore rebase to latest trunk, the merge was done by moving the byte_domain_state.tbl inside domain_state.tbl and using an #ifndef NATIVE_CODE guard.

This PR attempts to simplify the situation by making the domain state structure identical in bytecode and native code. There is also a nagging concern that differing state tables could somehow be brittle for not a lot of gain.

@kayceesrk kayceesrk merged commit 61760de into ocaml-multicore:5.00 Oct 11, 2021
@kayceesrk
Copy link
Contributor

LGTM.

sadiqj pushed a commit to sadiqj/ocaml that referenced this pull request Jan 10, 2022
…_domain_state

Make domain state the same in bytecode and native mode
ctk21 pushed a commit to ctk21/ocaml that referenced this pull request Jan 11, 2022
…_domain_state

Make domain state the same in bytecode and native mode
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.

None yet

2 participants