From a3e39a7ab5495a84c883f0fdca7024f0e8d089ad Mon Sep 17 00:00:00 2001 From: Alexander Bushnev Date: Fri, 17 Nov 2023 17:09:07 +0100 Subject: [PATCH] Rename ze_close_publication_cache to ze_undeclare_publication_cache + macros and examples update --- examples/z_pub_cache.c | 2 +- include/zenoh_commons.h | 10 ++--- include/zenoh_macros.h | 90 ++++++++++++++++++++-------------------- src/publication_cache.rs | 4 +- 4 files changed, 55 insertions(+), 51 deletions(-) diff --git a/examples/z_pub_cache.c b/examples/z_pub_cache.c index 1ff355aa2..b293197a7 100644 --- a/examples/z_pub_cache.c +++ b/examples/z_pub_cache.c @@ -58,7 +58,7 @@ int main(int argc, char **argv) { printf("Declaring publication cache on '%s'...\n", keyexpr); ze_owned_publication_cache_t pub_cache = ze_declare_publication_cache(z_loan(s), z_keyexpr(keyexpr), &pub_cache_opts); - if (!ze_publication_cache_check(&pub_cache)) { + if (!z_check(pub_cache)) { printf("Unable to declare publication cache for key expression!\n"); exit(-1); } diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h index 9aeb26d01..095f9eb01 100644 --- a/include/zenoh_commons.h +++ b/include/zenoh_commons.h @@ -2046,11 +2046,6 @@ void zc_shmbuf_set_length(const struct zc_owned_shmbuf_t *buf, uintptr_t len); ZENOHC_API enum zcu_locality_t zcu_locality_default(void); ZENOHC_API enum zcu_reply_keyexpr_t zcu_reply_keyexpr_default(void); -/** - * Closes the given :c:type:`ze_owned_publication_cache_t`, droping it and invalidating it for double-drop safety. - */ -ZENOHC_API -int8_t ze_close_publication_cache(struct ze_owned_publication_cache_t *pub_cache); /** * Declares a Publication Cache. * @@ -2143,6 +2138,11 @@ ZENOHC_API struct ze_owned_querying_subscriber_t ze_querying_subscriber_null(voi * Constructs the default value for :c:type:`ze_querying_subscriber_options_t`. */ ZENOHC_API struct ze_querying_subscriber_options_t ze_querying_subscriber_options_default(void); +/** + * Closes the given :c:type:`ze_owned_publication_cache_t`, droping it and invalidating it for double-drop safety. + */ +ZENOHC_API +int8_t ze_undeclare_publication_cache(struct ze_owned_publication_cache_t *pub_cache); /** * Undeclares the given :c:type:`ze_owned_querying_subscriber_t`, droping it and invalidating it for double-drop safety. */ diff --git a/include/zenoh_macros.h b/include/zenoh_macros.h index f5a81781c..9fa37aec2 100644 --- a/include/zenoh_macros.h +++ b/include/zenoh_macros.h @@ -16,31 +16,31 @@ )(&x) #define z_drop(x) \ - _Generic((x), z_owned_session_t * : z_close, \ - z_owned_publisher_t * : z_undeclare_publisher, \ - z_owned_keyexpr_t * : z_keyexpr_drop, \ - z_owned_config_t * : z_config_drop, \ - z_owned_scouting_config_t * : z_scouting_config_drop, \ - z_owned_pull_subscriber_t * : z_undeclare_pull_subscriber, \ - z_owned_subscriber_t * : z_undeclare_subscriber, \ - z_owned_queryable_t * : z_undeclare_queryable, \ - z_owned_encoding_t * : z_encoding_drop, \ - z_owned_reply_t * : z_reply_drop, \ - z_owned_hello_t * : z_hello_drop, \ - z_owned_str_t * : z_str_drop, \ - z_owned_closure_sample_t * : z_closure_sample_drop, \ - z_owned_closure_query_t * : z_closure_query_drop, \ - z_owned_closure_reply_t * : z_closure_reply_drop, \ - z_owned_closure_hello_t * : z_closure_hello_drop, \ - z_owned_closure_zid_t * : z_closure_zid_drop, \ - z_owned_reply_channel_closure_t * : z_reply_channel_closure_drop, \ - z_owned_reply_channel_t * : z_reply_channel_drop, \ - zc_owned_payload_t * : zc_payload_drop, \ - zc_owned_shmbuf_t * : zc_shmbuf_drop, \ - zc_owned_shm_manager_t * : zc_shm_manager_drop, \ - zc_owned_liveliness_token_t * : zc_liveliness_undeclare_token, \ - ze_owned_publication_cache_t* : ze_close_publication_cache, \ - ze_owned_querying_subscriber_t* : ze_undeclare_querying_subscriber \ + _Generic((x), z_owned_session_t * : z_close, \ + z_owned_publisher_t * : z_undeclare_publisher, \ + z_owned_keyexpr_t * : z_keyexpr_drop, \ + z_owned_config_t * : z_config_drop, \ + z_owned_scouting_config_t * : z_scouting_config_drop, \ + z_owned_pull_subscriber_t * : z_undeclare_pull_subscriber, \ + z_owned_subscriber_t * : z_undeclare_subscriber, \ + z_owned_queryable_t * : z_undeclare_queryable, \ + z_owned_encoding_t * : z_encoding_drop, \ + z_owned_reply_t * : z_reply_drop, \ + z_owned_hello_t * : z_hello_drop, \ + z_owned_str_t * : z_str_drop, \ + z_owned_closure_sample_t * : z_closure_sample_drop, \ + z_owned_closure_query_t * : z_closure_query_drop, \ + z_owned_closure_reply_t * : z_closure_reply_drop, \ + z_owned_closure_hello_t * : z_closure_hello_drop, \ + z_owned_closure_zid_t * : z_closure_zid_drop, \ + z_owned_reply_channel_closure_t * : z_reply_channel_closure_drop, \ + z_owned_reply_channel_t * : z_reply_channel_drop, \ + zc_owned_payload_t * : zc_payload_drop, \ + zc_owned_shmbuf_t * : zc_shmbuf_drop, \ + zc_owned_shm_manager_t * : zc_shm_manager_drop, \ + zc_owned_liveliness_token_t * : zc_liveliness_undeclare_token, \ + ze_owned_publication_cache_t * : ze_undeclare_publication_cache, \ + ze_owned_querying_subscriber_t * : ze_undeclare_querying_subscriber \ )(x) #define z_null(x) (*x = \ @@ -66,29 +66,31 @@ zc_owned_payload_t * : zc_payload_null, \ zc_owned_shmbuf_t * : zc_shmbuf_null, \ zc_owned_shm_manager_t * : zc_shm_manager_null, \ + ze_owned_publication_cache_t * : ze_publication_cache_null, \ zc_owned_liveliness_token_t * : zc_liveliness_token_null \ )()) #define z_check(x) \ - _Generic((x), z_owned_session_t : z_session_check, \ - z_owned_publisher_t : z_publisher_check, \ - z_owned_keyexpr_t : z_keyexpr_check, \ - z_keyexpr_t : z_keyexpr_is_initialized, \ - z_owned_config_t : z_config_check, \ - z_owned_scouting_config_t : z_scouting_config_check, \ - z_bytes_t : z_bytes_check, \ - z_owned_subscriber_t : z_subscriber_check, \ - z_owned_pull_subscriber_t : z_pull_subscriber_check, \ - z_owned_queryable_t : z_queryable_check, \ - z_owned_encoding_t : z_encoding_check, \ - z_owned_reply_t : z_reply_check, \ - z_owned_hello_t : z_hello_check, \ - z_owned_str_t : z_str_check, \ - zc_owned_payload_t : zc_payload_check, \ - zc_owned_shmbuf_t : zc_shmbuf_check, \ - zc_owned_shm_manager_t : zc_shm_manager_check, \ - zc_owned_liveliness_token_t : zc_liveliness_token_check, \ - ze_owned_querying_subscriber_t: ze_querying_subscriber_check \ + _Generic((x), z_owned_session_t : z_session_check, \ + z_owned_publisher_t : z_publisher_check, \ + z_owned_keyexpr_t : z_keyexpr_check, \ + z_keyexpr_t : z_keyexpr_is_initialized, \ + z_owned_config_t : z_config_check, \ + z_owned_scouting_config_t : z_scouting_config_check, \ + z_bytes_t : z_bytes_check, \ + z_owned_subscriber_t : z_subscriber_check, \ + z_owned_pull_subscriber_t : z_pull_subscriber_check, \ + z_owned_queryable_t : z_queryable_check, \ + z_owned_encoding_t : z_encoding_check, \ + z_owned_reply_t : z_reply_check, \ + z_owned_hello_t : z_hello_check, \ + z_owned_str_t : z_str_check, \ + zc_owned_payload_t : zc_payload_check, \ + zc_owned_shmbuf_t : zc_shmbuf_check, \ + zc_owned_shm_manager_t : zc_shm_manager_check, \ + zc_owned_liveliness_token_t : zc_liveliness_token_check, \ + ze_owned_publication_cache_t : ze_publication_cache_check, \ + ze_owned_querying_subscriber_t : ze_querying_subscriber_check \ )(&x) #define z_call(x, ...) \ diff --git a/src/publication_cache.rs b/src/publication_cache.rs index 45aa0e7d2..d7fbf347c 100644 --- a/src/publication_cache.rs +++ b/src/publication_cache.rs @@ -180,7 +180,9 @@ pub extern "C" fn ze_publication_cache_check(pub_cache: &ze_owned_publication_ca /// Closes the given :c:type:`ze_owned_publication_cache_t`, droping it and invalidating it for double-drop safety. #[no_mangle] #[allow(clippy::missing_safety_doc)] -pub extern "C" fn ze_close_publication_cache(pub_cache: &mut ze_owned_publication_cache_t) -> i8 { +pub extern "C" fn ze_undeclare_publication_cache( + pub_cache: &mut ze_owned_publication_cache_t, +) -> i8 { if let Some(p) = pub_cache.as_mut().take() { if let Err(e) = p.close().res_sync() { log::error!("{}", e);