From bf92e51229ce38ce4ac90b164f8486f891fa5812 Mon Sep 17 00:00:00 2001 From: Denis Biryukov Date: Sun, 29 Sep 2024 18:21:54 +0200 Subject: [PATCH] remove ze_serializer_from_bytes; add ze_serializer_from/to_writer and ze_deserializer_from/to_reader; --- docs/api.rst | 5 --- include/zenoh-pico/api/primitives.h | 12 ------- include/zenoh-pico/api/serialization.h | 50 -------------------------- src/api/api.c | 5 --- src/api/serialization.c | 20 ----------- tests/z_api_bytes_test.c | 3 +- 6 files changed, 2 insertions(+), 93 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index c2ad209d0..d35b26fb3 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -336,8 +336,6 @@ Primitives .. autocfunction:: primitives.h::z_slice_empty .. autocfunction:: primitives.h::z_slice_is_empty .. autocfunction:: serialization.h::ze_deserializer_from_bytes -.. autocfunction:: serialization.h::ze_deserializer_from_bytes_reader -.. autocfunction:: serialization.h::ze_deserializer_to_bytes_reader .. autocfunction:: serialization.h::ze_deserializer_deserialize_int8 .. autocfunction:: serialization.h::ze_deserializer_deserialize_int16 .. autocfunction:: serialization.h::ze_deserializer_deserialize_int32 @@ -353,8 +351,6 @@ Primitives .. autocfunction:: serialization.h::ze_deserializer_deserialize_sequence_begin .. autocfunction:: serialization.h::ze_deserializer_deserialize_sequence_end .. autocfunction:: serialization.h::ze_serializer_empty -.. autocfunction:: serialization.h::ze_serializer_from_bytes_writer -.. autocfunction:: serialization.h::ze_serializer_to_byte_writer .. autocfunction:: serialization.h::ze_serializer_finish .. autocfunction:: serialization.h::ze_serializer_serialize_int8 .. autocfunction:: serialization.h::ze_serializer_serialize_int16 @@ -418,7 +414,6 @@ Primitives .. autocfunction:: primitives.h::z_bytes_reader_seek .. autocfunction:: primitives.h::z_bytes_reader_tell .. autocfunction:: primitives.h::z_bytes_writer_empty -.. autocfunction:: primitives.h::z_bytes_writer_from_bytes .. autocfunction:: primitives.h::z_bytes_writer_finish .. autocfunction:: primitives.h::z_bytes_writer_write_all .. autocfunction:: primitives.h::z_bytes_writer_append diff --git a/include/zenoh-pico/api/primitives.h b/include/zenoh-pico/api/primitives.h index ce7efe94d..9ffc65dc8 100644 --- a/include/zenoh-pico/api/primitives.h +++ b/include/zenoh-pico/api/primitives.h @@ -749,18 +749,6 @@ z_result_t z_bytes_reader_seek(z_bytes_reader_t *reader, int64_t offset, int ori */ int64_t z_bytes_reader_tell(z_bytes_reader_t *reader); -/** - * Constructs writer for payload. - * - * Parameters: - * writer: An uninitialized memory location where writer is to be constructed. - * bytes: Data container to initiate the writer with. - * - * Return: - * ``0`` in case of success, ``negative value`` otherwise. - */ -z_result_t z_bytes_writer_from_bytes(z_owned_bytes_writer_t *writer, z_moved_bytes_t *bytes); - /** * Constructs an empty writer for payload. * diff --git a/include/zenoh-pico/api/serialization.h b/include/zenoh-pico/api/serialization.h index f3c188b7a..cab112c65 100644 --- a/include/zenoh-pico/api/serialization.h +++ b/include/zenoh-pico/api/serialization.h @@ -39,30 +39,6 @@ typedef struct _ze_serializer_t { */ _Z_OWNED_TYPE_VALUE_PREFIX(ze, _ze_serializer_t, serializer) -/** - * Constructs serializer from a `bytes_writer`. - * - * Parameters: - * serializer: An uninitialized memory location where serializer is to be constructed. - * writer: A writer to initialize serializer with. - * - * Return: - * ``0`` in case of success, ``negative value`` otherwise. - */ -z_result_t ze_serializer_from_bytes_writer(ze_owned_serializer_t *serializer, z_moved_bytes_writer_t *writer); - -/** - * Converts serializer into 'z_owned_bytes_writer_t'. This corresponds to initializing writer with serializer data. - * - * Parameters: - * serializer: A serializer instance. - * writer: An uninitialized memory location where 'z_owned_bytes_writer_t' is to be constructed. - * - * Return: - * ``0`` in case of success, ``negative value`` otherwise. - */ -z_result_t ze_serializer_to_bytes_writer(ze_moved_serializer_t *serializer, z_owned_bytes_writer_t *writer); - /** * Constructs an empty serializer. * @@ -97,32 +73,6 @@ void ze_serializer_finish(ze_moved_serializer_t *serializer, z_owned_bytes_t *by */ ze_deserializer_t ze_deserializer_from_bytes(const z_loaned_bytes_t *bytes); -/** - * Constructs deserializer from a `z_bytes_reader_t`.. The state of deserializer (i.e. underlying data and read - * position) will be initiated with the reader's state. - * - * - * Parameters: - * reader: A reader to initialize deserializer with. - * - * Return: - * The constructed :c:type:`ze_bytes_deserializer_t`. - */ -ze_deserializer_t ze_deserializer_from_bytes_reader(const z_bytes_reader_t *reader); - -/** - * Converts deserializer into a `z_bytes_reader_t`. The state of reader (i.e. underlying data and read position) will be - * initiated with the serializer's state. - * - * - * Parameters: - * deserializer: A deserializer to initialize reader with. - * - * Return: - * The constructed :c:type:`z_bytes_reader_t`. - */ -z_bytes_reader_t ze_deserializer_to_bytes_reader(const ze_deserializer_t *deserializer); - /** * Writes a serialized :c:type:`uint8_t` into underlying :c:type:`z_owned_bytes_t`. * diff --git a/src/api/api.c b/src/api/api.c index c56856f16..389663297 100644 --- a/src/api/api.c +++ b/src/api/api.c @@ -360,11 +360,6 @@ void z_bytes_writer_finish(z_moved_bytes_writer_t *writer, z_owned_bytes_t *byte bytes->_val = _z_bytes_writer_finish(&writer->_this._val); } -z_result_t z_bytes_writer_from_bytes(z_owned_bytes_writer_t *writer, z_moved_bytes_t *bytes) { - writer->_val = _z_bytes_writer_from_bytes(&bytes->_this._val); - return _Z_RES_OK; -} - z_result_t z_bytes_writer_empty(z_owned_bytes_writer_t *writer) { writer->_val = _z_bytes_writer_empty(); return _Z_RES_OK; diff --git a/src/api/serialization.c b/src/api/serialization.c index fb8b343d2..0355e1cb9 100644 --- a/src/api/serialization.c +++ b/src/api/serialization.c @@ -30,16 +30,6 @@ void _ze_serializer_clear(_ze_serializer_t *serializer) { _z_bytes_writer_clear( _Z_OWNED_FUNCTIONS_VALUE_NO_COPY_IMPL_PREFIX(ze, _ze_serializer_t, serializer, _ze_serializer_check, _ze_serializer_empty, _ze_serializer_clear) -z_result_t ze_serializer_from_bytes_writer(ze_owned_serializer_t *serializer, z_moved_bytes_writer_t *writer) { - _z_bytes_writer_move(&serializer->_val._writer, &writer->_this._val); - return _Z_RES_OK; -} - -z_result_t ze_serializer_to_writer(ze_moved_serializer_t *serializer, z_owned_bytes_writer_t *writer) { - _z_bytes_writer_move(&writer->_val, &serializer->_this._val._writer); - return _Z_RES_OK; -} - z_result_t ze_serializer_empty(ze_owned_serializer_t *serializer) { serializer->_val._writer = _z_bytes_writer_empty(); return _Z_RES_OK; @@ -55,16 +45,6 @@ ze_deserializer_t ze_deserializer_from_bytes(const z_loaned_bytes_t *bytes) { return d; } -ze_deserializer_t ze_deserializer_from_bytes_reader(const z_bytes_reader_t *reader) { - ze_deserializer_t d; - d._reader = *reader; - return d; -} - -z_bytes_reader_t ze_deserializer_to_bytes_reader(const ze_deserializer_t *deserializer) { - return deserializer->_reader; -} - z_result_t __read_single_byte(uint8_t *b, void *context) { z_bytes_reader_t *reader = (z_bytes_reader_t *)context; return _z_bytes_reader_read(reader, b, 1) == 1 ? _Z_RES_OK : _Z_ERR_DID_NOT_READ; diff --git a/tests/z_api_bytes_test.c b/tests/z_api_bytes_test.c index d962f86df..2e5f7cf38 100644 --- a/tests/z_api_bytes_test.c +++ b/tests/z_api_bytes_test.c @@ -109,7 +109,8 @@ void test_append(void) { z_bytes_copy_from_buf(&payload, data, 5); z_owned_bytes_writer_t writer; - z_bytes_writer_from_bytes(&writer, z_bytes_move(&payload)); + z_bytes_writer_empty(&writer); + z_bytes_writer_append(z_bytes_writer_loan_mut(&writer), z_bytes_move(&payload)); { z_owned_bytes_t b; z_bytes_copy_from_buf(&b, data + 5, 5);