Skip to content

Some OCaml 5 build fixes #5755

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
merged 2 commits into from
Jul 1, 2024
Merged

Some OCaml 5 build fixes #5755

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10468d7
Printf.kprintf is deprecated, replace with Printf.ksprintf
edwintorok Jun 28, 2024
f226aaa
Fix misplaced inline attributes
edwintorok Jun 28, 2024
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 ocaml/libs/xapi-stdext/lib/xapi-stdext-encodings/encodings.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ end
(* === UCS Validators === *)

module type UCS_VALIDATOR = sig
val validate : Uchar.t -> unit [@@inline]
val validate : Uchar.t -> unit
Copy link
Member

Choose a reason for hiding this comment

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

The two modules that seem to be of this type already inline this method

end

module UTF8_UCS_validator = struct
Expand Down
6 changes: 2 additions & 4 deletions ocaml/xenopsd/xc/domain.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,7 +1529,7 @@ let restore_common (task : Xenops_task.task_handle) ~xc ~xs
in
(th, ch)
in
let receive_thread_status threads_and_channels =
let[@inline never] receive_thread_status threads_and_channels =
(* Receive the status from all reader threads and let them exit.
This happens in two steps to make sure that we are unblocking and
closing all threads also in case of errors. *)
Expand All @@ -1549,9 +1549,7 @@ let restore_common (task : Xenops_task.task_handle) ~xc ~xs
(* Handle results returned by emu-manager *)
let emu_manager_results = handle_results () in
(* Wait for reader threads to complete *)
let[@inlined never] thread_status =
receive_thread_status threads_and_channels
in
let thread_status = receive_thread_status threads_and_channels in
(* Chain all together, and we are done! *)
let res =
emu_manager_results >>= fun result ->
Expand Down
Loading