From 869821e05c2ca81184128bfc31886263478be9b3 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:50:28 +0200 Subject: [PATCH] build: Sync with eclipse-zenoh/zenoh@4a8bd68 from 2024-10-17 (#773) Co-authored-by: eclipse-zenoh-bot --- Cargo.lock | 60 ++++++++++++------------- build-resources/opaque-types/Cargo.lock | 60 ++++++++++++------------- include/zenoh_commons.h | 25 +++++++++++ include/zenoh_macros.h | 8 ++++ 4 files changed, 93 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6ff103a0e..890f0de83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3705,7 +3705,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "ahash", "async-trait", @@ -3752,7 +3752,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "zenoh-collections", ] @@ -3790,7 +3790,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "tracing", "uhlc", @@ -3802,12 +3802,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "json5", "num_cpus", @@ -3828,7 +3828,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "lazy_static", "tokio", @@ -3839,7 +3839,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "aes", "hmac", @@ -3852,7 +3852,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "bincode", "flume", @@ -3869,7 +3869,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "hashbrown 0.14.5", "keyed-set", @@ -3883,7 +3883,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -3903,7 +3903,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "flume", @@ -3926,7 +3926,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "base64 0.22.1", @@ -3951,7 +3951,7 @@ dependencies = [ [[package]] name = "zenoh-link-serial" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "tokio", @@ -3969,7 +3969,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "socket2 0.5.7", @@ -3986,7 +3986,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "base64 0.22.1", @@ -4013,7 +4013,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4032,7 +4032,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixpipe" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "advisory-lock", "async-trait", @@ -4054,7 +4054,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "nix 0.29.0", @@ -4072,7 +4072,7 @@ dependencies = [ [[package]] name = "zenoh-link-vsock" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "libc", @@ -4090,7 +4090,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "futures-util", @@ -4110,7 +4110,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "proc-macro2", "quote", @@ -4121,7 +4121,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "git-version", "libloading", @@ -4137,7 +4137,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "const_format", "rand", @@ -4151,7 +4151,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "anyhow", ] @@ -4159,7 +4159,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "lazy_static", "ron", @@ -4172,7 +4172,7 @@ dependencies = [ [[package]] name = "zenoh-shm" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "advisory-lock", "async-trait", @@ -4195,7 +4195,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "event-listener 5.3.1", "futures", @@ -4208,7 +4208,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "futures", "tokio", @@ -4221,7 +4221,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "crossbeam-utils", @@ -4255,7 +4255,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "const_format", diff --git a/build-resources/opaque-types/Cargo.lock b/build-resources/opaque-types/Cargo.lock index b8693c471..8e1ff1153 100644 --- a/build-resources/opaque-types/Cargo.lock +++ b/build-resources/opaque-types/Cargo.lock @@ -3097,7 +3097,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "ahash", "async-trait", @@ -3144,7 +3144,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "zenoh-collections", ] @@ -3152,7 +3152,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "tracing", "uhlc", @@ -3164,12 +3164,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "json5", "num_cpus", @@ -3190,7 +3190,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "lazy_static", "tokio", @@ -3201,7 +3201,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "aes", "hmac", @@ -3214,7 +3214,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "bincode", "flume", @@ -3231,7 +3231,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "hashbrown", "keyed-set", @@ -3245,7 +3245,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -3265,7 +3265,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "flume", @@ -3288,7 +3288,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "base64 0.22.1", @@ -3313,7 +3313,7 @@ dependencies = [ [[package]] name = "zenoh-link-serial" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "tokio", @@ -3331,7 +3331,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "socket2", @@ -3348,7 +3348,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "base64 0.22.1", @@ -3375,7 +3375,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "socket2", @@ -3394,7 +3394,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixpipe" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "advisory-lock", "async-trait", @@ -3416,7 +3416,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "nix 0.29.0", @@ -3434,7 +3434,7 @@ dependencies = [ [[package]] name = "zenoh-link-vsock" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "libc", @@ -3452,7 +3452,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "futures-util", @@ -3472,7 +3472,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "proc-macro2", "quote", @@ -3483,7 +3483,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "git-version", "libloading", @@ -3499,7 +3499,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "const_format", "rand", @@ -3513,7 +3513,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "anyhow", ] @@ -3521,7 +3521,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "lazy_static", "ron", @@ -3534,7 +3534,7 @@ dependencies = [ [[package]] name = "zenoh-shm" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "advisory-lock", "async-trait", @@ -3557,7 +3557,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "event-listener", "futures", @@ -3570,7 +3570,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "futures", "tokio", @@ -3583,7 +3583,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "crossbeam-utils", @@ -3617,7 +3617,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#363e817ca511c764eb38212e2c4957f34a6c879e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4a8bd68f90ba8ffd4dbe85d0be56013d3391ea76" dependencies = [ "async-trait", "const_format", diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h index 9ff8b013f..154b033a2 100644 --- a/include/zenoh_commons.h +++ b/include/zenoh_commons.h @@ -1445,6 +1445,11 @@ ZENOHC_API void z_closure_hello_drop(struct z_moved_closure_hello_t *this_); */ ZENOHC_API const struct z_loaned_closure_hello_t *z_closure_hello_loan(const struct z_owned_closure_hello_t *closure); +/** + * Mutably norrows closure. + */ +ZENOHC_API +struct z_loaned_closure_hello_t *z_closure_hello_loan_mut(struct z_owned_closure_hello_t *closure); /** * @brief Constructs closure. * @@ -1479,6 +1484,11 @@ ZENOHC_API void z_closure_query_drop(struct z_moved_closure_query_t *closure_); */ ZENOHC_API const struct z_loaned_closure_query_t *z_closure_query_loan(const struct z_owned_closure_query_t *closure); +/** + * Mutably borrows closure. + */ +ZENOHC_API +struct z_loaned_closure_query_t *z_closure_query_loan_mut(struct z_owned_closure_query_t *closure); /** * @brief Constructs closure. * @@ -1514,6 +1524,11 @@ void z_closure_reply_drop(struct z_moved_closure_reply_t *closure_); */ ZENOHC_API const struct z_loaned_closure_reply_t *z_closure_reply_loan(const struct z_owned_closure_reply_t *closure); +/** + * Mutably borrows closure. + */ +ZENOHC_API +struct z_loaned_closure_reply_t *z_closure_reply_loan_mut(struct z_owned_closure_reply_t *closure); /** * @brief Constructs closure. * @@ -1548,6 +1563,11 @@ ZENOHC_API void z_closure_sample_drop(struct z_moved_closure_sample_t *closure_) */ ZENOHC_API const struct z_loaned_closure_sample_t *z_closure_sample_loan(const struct z_owned_closure_sample_t *closure); +/** + * Mutably borrows closure. + */ +ZENOHC_API +struct z_loaned_closure_sample_t *z_closure_sample_loan_mut(struct z_owned_closure_sample_t *closure); /** * @brief Constructs closure. * @@ -1583,6 +1603,11 @@ void z_closure_zid_drop(struct z_moved_closure_zid_t *closure_); */ ZENOHC_API const struct z_loaned_closure_zid_t *z_closure_zid_loan(const struct z_owned_closure_zid_t *closure); +/** + * @brief Mutably borrows closure. + */ +ZENOHC_API +const struct z_loaned_closure_zid_t *z_closure_zid_loan_mut(const struct z_owned_closure_zid_t *closure); /** * Drops conditional variable. */ diff --git a/include/zenoh_macros.h b/include/zenoh_macros.h index c6151c597..b12114f3e 100644 --- a/include/zenoh_macros.h +++ b/include/zenoh_macros.h @@ -109,6 +109,10 @@ static inline ze_moved_serializer_t* ze_serializer_move(ze_owned_serializer_t* x _Generic((this_), \ z_owned_bytes_t : z_bytes_loan_mut, \ z_owned_bytes_writer_t : z_bytes_writer_loan_mut, \ + z_owned_closure_hello_t : z_closure_hello_loan_mut, \ + z_owned_closure_query_t : z_closure_query_loan_mut, \ + z_owned_closure_reply_t : z_closure_reply_loan_mut, \ + z_owned_closure_sample_t : z_closure_sample_loan_mut, \ z_owned_condvar_t : z_condvar_loan_mut, \ z_owned_config_t : z_config_loan_mut, \ z_owned_encoding_t : z_encoding_loan_mut, \ @@ -604,6 +608,10 @@ inline const ze_loaned_serializer_t* z_loan(const ze_owned_serializer_t& this_) inline z_loaned_bytes_t* z_loan_mut(z_owned_bytes_t& this_) { return z_bytes_loan_mut(&this_); }; inline z_loaned_bytes_writer_t* z_loan_mut(z_owned_bytes_writer_t& this_) { return z_bytes_writer_loan_mut(&this_); }; +inline z_loaned_closure_hello_t* z_loan_mut(z_owned_closure_hello_t& closure) { return z_closure_hello_loan_mut(&closure); }; +inline z_loaned_closure_query_t* z_loan_mut(z_owned_closure_query_t& closure) { return z_closure_query_loan_mut(&closure); }; +inline z_loaned_closure_reply_t* z_loan_mut(z_owned_closure_reply_t& closure) { return z_closure_reply_loan_mut(&closure); }; +inline z_loaned_closure_sample_t* z_loan_mut(z_owned_closure_sample_t& closure) { return z_closure_sample_loan_mut(&closure); }; inline z_loaned_condvar_t* z_loan_mut(z_owned_condvar_t& this_) { return z_condvar_loan_mut(&this_); }; inline z_loaned_config_t* z_loan_mut(z_owned_config_t& this_) { return z_config_loan_mut(&this_); }; inline z_loaned_encoding_t* z_loan_mut(z_owned_encoding_t& this_) { return z_encoding_loan_mut(&this_); };