Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 rayforce-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use std::process::Command;
/// these in lockstep with a `rayforce-sys` release. Override at build time with
/// the `RAYFORCE_REPO` / `RAYFORCE_REF` (and `_Q_` variants) env vars.
const RAYFORCE_REPO: &str = "https://github.com/RayforceDB/rayforce.git";
const RAYFORCE_REF: &str = "v2.5.1";
const RAYFORCE_REF: &str = "v2.5.8";
const RAYFORCE_Q_REPO: &str = "https://github.com/RayforceDB/rayforce-q.git";
const RAYFORCE_Q_REF: &str = "2.0.0";

Expand Down
10 changes: 5 additions & 5 deletions rayforce-sys/wrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ ray_t* ray_de(ray_t* bytes);
/* src/core/runtime.c — last per-VM error message (set alongside a RAY_ERROR) */
const char* ray_error_msg(void);

/* src/core/poll.h + runtime.h — the IPC client requires a poll object on the
* runtime before connecting (ray_poll_t is opaque; use void*). */
void* ray_poll_create(void);
void* ray_runtime_get_poll(void);
void ray_runtime_set_poll(void* poll);
/* The poll object the IPC client needs (ray_poll_create / ray_runtime_get_poll
* / ray_runtime_set_poll) is exported by the public header as of core v2.5.8,
* so it is no longer hand-declared here. ray_poll_create now returns the typed
* `ray_poll_t*` rather than the old `void*` — see the cast in
* rayforce/src/ipc.rs::ensure_poll. */

#ifdef __cplusplus
}
Expand Down
5 changes: 4 additions & 1 deletion rayforce/src/ipc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ use std::marker::PhantomData;
/// Ensure the runtime has a poll object (required before connecting).
unsafe fn ensure_poll() {
if sys::ray_runtime_get_poll().is_null() {
// Since core v2.5.8 the public header types `ray_poll_create` as
// `ray_poll_t*`, while `ray_runtime_set_poll` still takes `void*` —
// so the handle needs an explicit cast on the way through.
let p = sys::ray_poll_create();
sys::ray_runtime_set_poll(p);
sys::ray_runtime_set_poll(p.cast());
}
}

Expand Down
Loading