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

add possibility to get contiguous view of z_bytes data when it is not fragmented #865

Merged
merged 2 commits into from
Dec 18, 2024
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
5 changes: 5 additions & 0 deletions docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ Types
.. doxygenstruct:: z_bytes_reader_t
.. doxygenstruct:: z_owned_bytes_writer_t
.. doxygenstruct:: z_loaned_bytes_writer_t
.. doxygenstruct:: z_bytes_slice_iterator_t

Functions
^^^^^^^^^
Expand All @@ -303,6 +304,10 @@ Functions
.. doxygenfunction:: z_bytes_loan_mut
.. doxygenfunction:: z_bytes_drop

.. doxygenfunction:: z_bytes_get_slice_iterator
.. doxygenfunction:: z_bytes_slice_iterator_next
.. doxygenfunction:: z_bytes_get_contiguous_view

.. doxygenfunction:: z_bytes_get_reader
.. doxygenfunction:: z_bytes_reader_read
.. doxygenfunction:: z_bytes_reader_seek
Expand Down
15 changes: 15 additions & 0 deletions include/zenoh_commons.h
Original file line number Diff line number Diff line change
Expand Up @@ -1540,6 +1540,21 @@ z_result_t z_bytes_from_str(struct z_owned_bytes_t *this_,
* The string is consumed upon function return.
*/
ZENOHC_API void z_bytes_from_string(struct z_owned_bytes_t *this_, struct z_moved_string_t *s);
/**
* @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
* Attempts to get a contiguous view to the underlying bytes.
* This is only possible if data is not fragmented, otherwise the function will fail.
* In case of fragmented data, consider using `z_bytes_get_slice_iterator()`.
*
* @param this_: An instance of Zenoh data.
* @param view: An uninitialized memory location where a contiguous view on data will be constructed.
* @return ​0​ upon success, negative error code otherwise.
*/
#if defined(Z_FEATURE_UNSTABLE_API)
ZENOHC_API
z_result_t z_bytes_get_contiguous_view(const struct z_loaned_bytes_t *this_,
fuzzypixelz marked this conversation as resolved.
Show resolved Hide resolved
struct z_view_slice_t *view);
#endif
/**
* Returns a reader for the data.
*
Expand Down
25 changes: 25 additions & 0 deletions src/zbytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,31 @@ pub extern "C" fn z_bytes_slice_iterator_next(
}
}

#[cfg(feature = "unstable")]
/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
/// Attempts to get a contiguous view to the underlying bytes.
/// This is only possible if data is not fragmented, otherwise the function will fail.
/// In case of fragmented data, consider using `z_bytes_get_slice_iterator()`.
///
/// @param this_: An instance of Zenoh data.
/// @param view: An uninitialized memory location where a contiguous view on data will be constructed.
/// @return ​0​ upon success, negative error code otherwise.
#[no_mangle]
pub extern "C" fn z_bytes_get_contiguous_view(
this: &'static z_loaned_bytes_t,
view: &mut MaybeUninit<z_view_slice_t>,
) -> result::z_result_t {
let payload = this.as_rust_type_ref();
match payload.to_bytes() {
std::borrow::Cow::Borrowed(s) => {
view.as_rust_type_mut_uninit()
.write(CSliceView::from_slice(s));
result::Z_OK
}
std::borrow::Cow::Owned(_) => result::Z_EINVAL,
}
}

#[cfg(all(feature = "shared-memory", feature = "unstable"))]
/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
/// @brief Converts from an immutable SHM buffer consuming it.
Expand Down
16 changes: 12 additions & 4 deletions tests/z_api_payload_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,19 @@ bool check_slice(const z_loaned_bytes_t *b, const uint8_t *data, size_t len) {
void test_slices(void) {
uint8_t data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
z_owned_bytes_t payload;
z_owned_bytes_writer_t writer;
z_bytes_writer_empty(&writer);
z_bytes_writer_write_all(z_loan_mut(writer), data, 10);
z_bytes_writer_finish(z_move(writer), &payload);
z_bytes_copy_from_buf(&payload, data, 10);
assert(check_slice(z_loan(payload), data, 10));

#if defined(Z_FEATURE_UNSTABLE_API)
z_view_slice_t view;
assert(z_bytes_get_contiguous_view(z_loan(payload), &view) == Z_OK);
assert(z_slice_len(z_loan(view)) == 10);
assert(memcmp(data, z_slice_data(z_loan(view)), 10) == 0);
#endif

z_drop(z_move(payload));

z_owned_bytes_writer_t writer;
// possible multiple slices
z_bytes_writer_empty(&writer);

Expand All @@ -249,6 +254,9 @@ void test_slices(void) {
}
z_bytes_writer_finish(z_move(writer), &payload);
assert(check_slice(z_loan(payload), data, 10));
#if defined(Z_FEATURE_UNSTABLE_API)
assert(z_bytes_get_contiguous_view(z_loan(payload), &view) != Z_OK);
#endif
z_drop(z_move(payload));
}

Expand Down
Loading