Skip to content
Open
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
16 changes: 15 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ test_all:
## ------

## Run all checks except generated files
check_other: check_build check_docs check_format check_lint check_tests
check_other: check_build check_docs check_format check_lint check_tests check_mdb_axis_os_11
.PHONY: check_other

## Check that all crates can be built
Expand Down Expand Up @@ -223,6 +223,14 @@ check_lint:
-Dwarnings
.PHONY: check_lint

## Check mdb against the AXIS OS 11 (SDK 1.15) host bindings
check_mdb_axis_os_11:
cargo check \
--locked \
--package mdb \
--features mdb-sys/axis-os-11
.PHONY: check_mdb_axis_os_11

## Check that risky FFI patterns are sound using miri
check_miri:
rustup +nightly-2025-04-18 component add miri
Expand Down Expand Up @@ -287,6 +295,12 @@ apps-$(AXIS_DEVICE_ARCH).filesize: target-$(AXIS_DEVICE_ARCH)/acap/_envoy
crates/%-sys/src/bindings.rs: target-$(AXIS_DEVICE_ARCH)/acap/_envoy
cp --archive $(firstword $(wildcard target-$(AXIS_DEVICE_ARCH)/*/*/build/$*-sys-*/out/bindings.rs)) $@

## Regenerate the AXIS OS 11 mdb-sys bindings (run in the acaprs-dev:1.15.1 container)
crates/mdb-sys/src/bindings_axis_os_11.rs:
CARGO_TARGET_DIR=target-$(AXIS_DEVICE_ARCH) \
cargo build --locked --package mdb-sys --target aarch64-unknown-linux-gnu
cp --archive $(firstword $(wildcard target-$(AXIS_DEVICE_ARCH)/*/*/build/mdb-sys-*/out/bindings.rs)) $@

target-$(AXIS_DEVICE_ARCH)/acap/_envoy:
CARGO_TARGET_DIR=target-$(AXIS_DEVICE_ARCH) \
cargo-acap-build \
Expand Down
4 changes: 4 additions & 0 deletions crates/mdb-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ version = "0.0.0"
edition.workspace = true
license = "MIT"

[features]
# Use the AXIS OS 11 (SDK 1.15) host bindings instead of the default (AXIS OS 12).
axis-os-11 = []

[build-dependencies]
bindgen = { workspace = true }
pkg-config = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions crates/mdb-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ fn populated_bindings(dst: &path::PathBuf) {
.allowlist_type("^(mdb_.*)$")
.allowlist_var("^(mdb_.*)$")
.allowlist_recursively(false)
.blocklist_type("mdb_on_error_t")
.layout_tests(false);
for path in library.include_paths {
bindings = bindings.clang_args(&["-I", path.to_str().unwrap()]);
Expand Down
3 changes: 0 additions & 3 deletions crates/mdb-sys/src/bindings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ pub struct mdb_error_t {
pub code: mdb_error_code_t,
pub message: *mut ::std::os::raw::c_char,
}
pub type mdb_on_error_t = ::std::option::Option<
unsafe extern "C" fn(error: *const mdb_error_t, user_data: *mut ::std::os::raw::c_void),
>;
extern "C" {
pub fn mdb_error_destroy(error: *mut *mut mdb_error_t);
}
Expand Down
98 changes: 98 additions & 0 deletions crates/mdb-sys/src/bindings_axis_os_11.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
/* automatically generated by rust-bindgen 0.69.5 */

pub const mdb_error_code_t_MDB_ERROR_NONE: mdb_error_code_t = 0;
pub const mdb_error_code_t_MDB_ERROR_ACCESS_DENIED: mdb_error_code_t = -1;
pub const mdb_error_code_t_MDB_ERROR_IO: mdb_error_code_t = -2;
pub const mdb_error_code_t_MDB_ERROR_MEMORY: mdb_error_code_t = -3;
pub const mdb_error_code_t_MDB_ERROR_OTHER: mdb_error_code_t = -4;
pub const mdb_error_code_t_MDB_ERROR_TIMEOUT: mdb_error_code_t = -5;
pub const mdb_error_code_t_MDB_ERROR_USER: mdb_error_code_t = -6;
pub const mdb_error_code_t_MDB_ERROR_VERSION_ERROR: mdb_error_code_t = -7;
pub const mdb_error_code_t_MDB_ERROR_TOO_MANY_PENDING_MESSAGES: mdb_error_code_t = -8;
pub type mdb_error_code_t = ::std::os::raw::c_int;
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct mdb_error_t {
pub code: mdb_error_code_t,
pub message: *mut ::std::os::raw::c_char,
}
extern "C" {
pub fn mdb_error_destroy(error: *mut *mut mdb_error_t);
}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct mdb_connection {
_unused: [u8; 0],
}
pub type mdb_connection_t = mdb_connection;
extern "C" {
pub fn mdb_connection_create(
on_error: mdb_on_error_t,
user_data: *mut ::std::os::raw::c_void,
error: *mut *mut mdb_error_t,
) -> *mut mdb_connection_t;
}
extern "C" {
pub fn mdb_connection_destroy(self_: *mut *mut mdb_connection_t);
}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct mdb_message {
_unused: [u8; 0],
}
pub type mdb_message_t = mdb_message;
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct mdb_message_payload {
pub size: usize,
pub data: *mut u8,
}
pub type mdb_message_payload_t = mdb_message_payload;
extern "C" {
pub fn mdb_message_get_payload(message: *const mdb_message_t) -> *const mdb_message_payload_t;
}
extern "C" {
pub fn mdb_message_get_timestamp(message: *const mdb_message_t) -> *const timespec;
}
pub type mdb_on_done_t = ::std::option::Option<
unsafe extern "C" fn(error: *const mdb_error_t, user_data: *mut ::std::os::raw::c_void),
>;
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct mdb_subscriber_config {
_unused: [u8; 0],
}
pub type mdb_subscriber_config_t = mdb_subscriber_config;
pub type mdb_subscriber_on_message_t = ::std::option::Option<
unsafe extern "C" fn(message: *const mdb_message_t, user_data: *mut ::std::os::raw::c_void),
>;
extern "C" {
pub fn mdb_subscriber_config_create(
topic: *const ::std::os::raw::c_char,
source: *const ::std::os::raw::c_char,
on_message: mdb_subscriber_on_message_t,
user_data: *mut ::std::os::raw::c_void,
error: *mut *mut mdb_error_t,
) -> *mut mdb_subscriber_config_t;
}
extern "C" {
pub fn mdb_subscriber_config_destroy(self_: *mut *mut mdb_subscriber_config_t);
}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct mdb_subscriber {
_unused: [u8; 0],
}
pub type mdb_subscriber_t = mdb_subscriber;
extern "C" {
pub fn mdb_subscriber_create_async(
connection: *mut mdb_connection_t,
config: *mut mdb_subscriber_config_t,
on_done: mdb_on_done_t,
user_data: *mut ::std::os::raw::c_void,
error: *mut *mut mdb_error_t,
) -> *mut mdb_subscriber_t;
}
extern "C" {
pub fn mdb_subscriber_destroy(self_: *mut *mut mdb_subscriber_t);
}
17 changes: 16 additions & 1 deletion crates/mdb-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,23 @@

pub use libc::timespec;

// SDK 1.15 declares the error pointer mutable; the ABI is the same.
// Don't copy this pattern: a hand-written signature can drift from what the library provides.
// It is acceptable here only because MDB is deprecated and will be removed.
pub type mdb_on_error_t =
Comment thread
apljungquist marked this conversation as resolved.
Resolved
Option<unsafe extern "C" fn(error: *const mdb_error_t, user_data: *mut libc::c_void)>;

#[cfg(not(any(target_arch = "x86_64", target_os = "macos")))]
include!(concat!(env!("OUT_DIR"), "/bindings.rs"));

#[cfg(any(target_arch = "x86_64", target_os = "macos"))]
#[cfg(all(
any(target_arch = "x86_64", target_os = "macos"),
feature = "axis-os-11"
))]
include!("./bindings_axis_os_11.rs");

#[cfg(all(
any(target_arch = "x86_64", target_os = "macos"),
not(feature = "axis-os-11")
))]
include!("./bindings.rs");