Skip to content

obs-core: swap generic object ID query to safe Rust (Refs #5234) - #5239

Merged
zackees merged 2 commits into
masterfrom
port/5234-object-id
Nov 19, 2026
Merged

zackees merged 2 commits into
masterfrom
port/5234-object-id

Conversation

@zackees

@zackees zackees commented Nov 19, 2026

Copy link
Copy Markdown
Member

Refs #5234. The extracted generic object-ID query now selects its borrowed result in safe obs-core Rust. It returns the source/output/encoder/service info.id pointer unchanged, including NULL and empty IDs, with no allocation or mutation. Encoder queries preserve info.id rather than orig_info.id.

Rust rejects NULL before calling a field adapter and rejects unsupported kinds before projecting a concrete object. Five private adapters borrow fields from the real C headers; Rust duplicates no object layout. They reuse #5190's existing demand-linked adapter archive and canonical consumers, following #5211. The unchanged original C body remains in a reference-only group. Existing C characterization, public headers, WebSocket plugin and workflow files are unchanged. There are no intentional behavior differences; Tier 4 is inapplicable to this metadata query.

RED commit e754037 adds the six safe mirrors of test_object_id.c against a todo stub. The focused Core state command exited 101 with all six failures at that stub. GREEN commit 9078b5d (final signed head) implements the swap, ABI shim and original-C differential: all seven focused cases pass. The differential exercises every supported kind, NULL/empty/arbitrary IDs, arbitrary unsupported type bits, context-sized unsupported objects, actual adapter field addresses and complete object immutability. The always-NULL mutation was killed by the original-C differential (exit 101 at oracle_object_id_check); the source was restored byte for byte.

Verification: all 1,343 obs_core:: parent tests and all 321 native_build:: parent tests pass, including their child-process checks. The focused Linux Tier 2 build linked every configured *_rust target (64), including test_scene_bounds_place_rust and test_window_match_steps_rust. The unchanged object-ID characterization passed three repeats in both OFF and ON; ldd confirmed the intended library in each mode, and exported symbol sets match. ci/windows_link_check.py passed the eight Windows MSVC Rust categories, then hybrid libobs and all 55 selected Rust fixtures for Windows MSVC x64 and Darwin arm64.

A separate ci/cmocka_link_check.py --alias mac-arm64 also passed, and the unchanged test_object_id executable linked in that Darwin tree. Mach-O llvm-nm -m shows the public _obs_obj_get_id at 0x90abc and private adapter definitions at 0xab1c (kind), 0xab24 (source), 0xab2c (output), 0xab34 (encoder) and 0xab3c (service). llvm-objdump shows the NULL cbz before the kind call and direct bl instructions to these five definitions. The characterization imports _obs_obj_get_id from obs and defines none of the adapters. This Rust path calls only private field adapters, with no fake-overridden runtime seam (#5226). soldr cargo fmt --all --check passed, and the single full SOLDR_PORCELAIN=0 ./lint run passed (454.2 s). The restored focused cases passed again after the mutation.

Test cost: 25 reduced-parity debug runs of the new module; longest 0.041 s, peak RSS 25,628 KiB, no test-owned threads. The existing category binaries are retained. One clud-review primary reviewer found no issues.

Native Windows/macOS runtime execution and hosted merge-queue validation remain for CI. Local cross-link and symbol inspection establish linkage, not execution on those hosts. Forced-fetched current open PR heads and ran merge-tree: clean against queued #5226 and rdoupe’s #5225. Only the overlapping DIRTY #5155, #5061 and #4655 conflict; no queued conflict requires waiting. All temporary refs were deleted, and no sibling branch was modified.

Publication evidence: complete client attestation passed six-target clippy and Dylint, repository self-checks/validators, 9,192 host cases (six existing skips), 920 utility feature cases, documentation tests and Windows GNU category links. The final signed head has exactly the reviewed GREEN source tree.

Ci-Attestation: {"at":1795094036,"gate":"data/all/compatibility","host":"linux-x86_64","key":"","lane":"client-checks","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":133,"stamp":"e90bfcb011b69602f832d60933d3f320","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795094036,"gate":"data/all/flatpak-manifest","host":"linux-x86_64","key":"","lane":"client-checks","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":133,"stamp":"282241337dc3f47b27968b70a9ff5501","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795094036,"gate":"data/all/qt-xml","host":"linux-x86_64","key":"","lane":"client-checks","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":133,"stamp":"ec4edd0a607c33e06971b9a0f31d5ea0","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795094036,"gate":"data/all/services-schema","host":"linux-x86_64","key":"","lane":"client-checks","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":133,"stamp":"ac423274f979089ec2363395cfb60701","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093900,"gate":"general/all/client-lint","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"0c822ef4dd6574df21951e9460bf9bef","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795094036,"gate":"python/all/self-test","host":"linux-x86_64","key":"","lane":"client-checks","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":133,"stamp":"8f5173c7ede4c6be4ca51aec2df65d99","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093901,"gate":"rust/aarch64-apple-darwin/client-clippy","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"14d95bf7acfc8929ee57d3eee0cd4549","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093901,"gate":"rust/aarch64-apple-darwin/client-dylint","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"ba036cb76e710d20e9b70f129d8abf3c","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093901,"gate":"rust/aarch64-pc-windows-msvc/client-clippy","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"f5472fd6e888f5a7a263f8a41433c7e2","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093901,"gate":"rust/aarch64-pc-windows-msvc/client-dylint","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"107fee79483754d6e671f1d464b568ec","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093900,"gate":"rust/aarch64-unknown-linux-gnu/client-clippy","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"7008606aa21afaf07f0fb34e598f75da","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093900,"gate":"rust/aarch64-unknown-linux-gnu/client-dylint","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"77fec52b6d6979bb50dc1a5f2fa6b121","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093901,"gate":"rust/x86_64-apple-darwin/client-clippy","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"22f374a188ba7c4354406cac5679671f","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093901,"gate":"rust/x86_64-apple-darwin/client-dylint","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"8fd8adfa1d37eb757cad09df45534200","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093901,"gate":"rust/x86_64-pc-windows-msvc/client-clippy","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"ad79dcd8fed8956de8bc93b3db1fef76","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093901,"gate":"rust/x86_64-pc-windows-msvc/client-dylint","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"5e874fb3f534d332f8e00ab0b6c7ce1e","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093900,"gate":"rust/x86_64-unknown-linux-gnu/client-clippy","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"4b2a661a5837d4953094d6c6db14c7a3","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795093900,"gate":"rust/x86_64-unknown-linux-gnu/client-dylint","host":"linux-x86_64","key":"1c0a569471c340e08e3ee4b71b42515122339a4b762387c1fa65d931509bb600","lane":"client-lint","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":214,"stamp":"d629d66a22ba95d55362ada00516e872","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}
Ci-Attestation: {"at":1795094871,"gate":"rust/x86_64-unknown-linux-gnu/client-test","host":"linux-x86_64","key":"5b541bb90eef3dd355d42750e1f09141db0beb0e8524713b7c3c3924210064f5","lane":"client-test-x86_64-unknown-linux-gnu","parents":["e75403784ebb42b5f7c361b0e854d8c2c9f517ab"],"secs":833,"stamp":"557ae743fd5c6f63244745fe8acffb79","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913","v":1,"via":"run"}

Client-Checks: {"checks":{"base":"e6942badc9ef36cd7b63a6f4fced41d4aa090e55","coverage":"all-tracked-applicable-files","diff":["libobs/build/libobs.core+.h.c","libobs/build/libobs.ported-object-id+.h.c","libobs/build/ported-source-sets/object-id.json","libobs/cmake/rust-exports.d/obs-core-object_id.txt","libobs/obs-object-id-fields.c.h","rust/README.md","rust/obs-build/tests/native.rs","rust/obs-build/tests/native/registration/canonical_object_id_swap_is_registered.rs","rust/obs-c-oracle/oracle/object_id.c","rust/obs-core/src/ffi/mod.rs","rust/obs-core/src/ffi/object_id.rs","rust/obs-core/src/lib.rs","rust/obs-core/src/object_id.rs","rust/obs-core/tests/obs_core/main.rs","rust/obs-core/tests/obs_core/object_id.rs","rust/obs-core/tests/obs_core/object_id_parity.rs","test/cmocka/video-info-query-link-support.c"],"head":"d775d24be30f8d34b55aa9851fc1a1468df4fee1","tools":{"orchestrator-python":"3.14.7 (main, Aug 14 2026, 15:35:28) [Clang 22.1.3 ]","schema-dependencies":"3.14.7 (main, Aug 14 2026, 15:35:28) [Clang 22.1.3 ]\n{'jsonschema': '4.26.0', 'json_source_map': '1.0.5'}","uv":"uv 0.13.5 (x86_64-unknown-linux-gnu)","xmllint":"xmllint: using libxml version 21504\n   compiled with: Threads Tree Output Push Reader Patterns Writer SAXv1 DTDValid HTML C14N Catalog XPath XPointer XInclude Iconv ISO8859X Regexps Automata RelaxNG Schemas Modules Debug"},"tracked-digest":"a3e172bbba9ac0c7162f4ba824d697aa9a5ae1441a0361145b4f3364cbee1a80","tree":"5e4723a1602e2f1f89a24660d59b76883b16b913"}}
@zackees zackees added the pool-active Pool worker owns this PR; automated rebases must skip it label Nov 19, 2026
@zackees
zackees enabled auto-merge November 19, 2026 13:29
@zackees zackees removed the pool-active Pool worker owns this PR; automated rebases must skip it label Nov 19, 2026
@zackees
zackees added this pull request to the merge queue Nov 19, 2026
Merged via the queue into master with commit 6360849 Nov 19, 2026
41 checks passed
@zackees
zackees deleted the port/5234-object-id branch November 19, 2026 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant