diff --git a/Cargo.lock b/Cargo.lock index 64dbc47e7..fbfa7b9c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3718,9 +3718,10 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "ahash", + "async-channel 2.3.1", "async-trait", "bytes", "flume", @@ -3765,7 +3766,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "zenoh-collections", ] @@ -3802,7 +3803,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "tracing", "uhlc", @@ -3814,12 +3815,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "json5", "num_cpus", @@ -3841,7 +3842,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "lazy_static", "tokio", @@ -3852,7 +3853,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "aes", "hmac", @@ -3865,7 +3866,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "bincode", "flume", @@ -3882,7 +3883,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "hashbrown 0.14.5", "keyed-set", @@ -3896,7 +3897,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -3916,7 +3917,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "flume", @@ -3940,7 +3941,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "base64 0.22.1", @@ -3966,7 +3967,7 @@ dependencies = [ [[package]] name = "zenoh-link-serial" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "tokio", @@ -3984,7 +3985,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4001,7 +4002,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "base64 0.22.1", @@ -4030,7 +4031,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4049,7 +4050,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixpipe" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "advisory-lock", "async-trait", @@ -4071,7 +4072,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "nix 0.29.0", @@ -4089,7 +4090,7 @@ dependencies = [ [[package]] name = "zenoh-link-vsock" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "libc", @@ -4107,7 +4108,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "futures-util", @@ -4127,7 +4128,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "proc-macro2", "quote", @@ -4138,7 +4139,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "git-version", "libloading", @@ -4154,7 +4155,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "const_format", "rand", @@ -4168,7 +4169,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "anyhow", ] @@ -4176,7 +4177,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "lazy_static", "ron", @@ -4189,7 +4190,7 @@ dependencies = [ [[package]] name = "zenoh-shm" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "advisory-lock", "async-trait", @@ -4212,7 +4213,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "event-listener 5.3.1", "futures", @@ -4225,7 +4226,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "futures", "tokio", @@ -4238,7 +4239,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "crossbeam-utils", @@ -4272,7 +4273,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "const_format", diff --git a/Cargo.toml b/Cargo.toml index f4b830e35..43face732 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ [package] name = "zenoh-c" version = "1.0.0-dev" -repository = "https://github.com/eclipse-zenoh/zenoh-c" +repository = "https://github.com/ZettaScaleLabs/zenoh-c" homepage = "http://zenoh.io" authors = [ "kydos ", @@ -74,10 +74,10 @@ spin = "0.9.5" tokio = "*" unwrap-infallible = "0.1.5" const_format = "0.2.32" -zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features = ["internal"] } -zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", features=["internal"], branch = "main" } -zenoh-runtime = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } -zenoh-util = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } +zenoh = { version = "1.0.0-dev", git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "nolocal_close", default-features = false, features = ["internal"] } +zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/ZettaScaleLabs/zenoh.git", features=["internal"], branch = "nolocal_close" } +zenoh-runtime = { version = "1.0.0-dev", git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "nolocal_close" } +zenoh-util = { version = "1.0.0-dev", git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "nolocal_close" } flume = "*" [build-dependencies] diff --git a/Cargo.toml.in b/Cargo.toml.in index 9fdb4796c..fe0f5ee8b 100644 --- a/Cargo.toml.in +++ b/Cargo.toml.in @@ -14,7 +14,7 @@ [package] name = "zenoh-c" version = "@CARGO_PROJECT_VERSION@" -repository = "https://github.com/eclipse-zenoh/zenoh-c" +repository = "https://github.com/ZettaScaleLabs/zenoh-c" homepage = "http://zenoh.io" authors = [ "kydos ", @@ -74,10 +74,10 @@ spin = "0.9.5" tokio = "*" unwrap-infallible = "0.1.5" const_format = "0.2.32" -zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features = ["internal"] } -zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", features=["internal"], branch = "main" } -zenoh-runtime = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } -zenoh-util = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } +zenoh = { version = "1.0.0-dev", git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "nolocal_close", default-features = false, features = ["internal"] } +zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/ZettaScaleLabs/zenoh.git", features=["internal"], branch = "nolocal_close" } +zenoh-runtime = { version = "1.0.0-dev", git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "nolocal_close" } +zenoh-util = { version = "1.0.0-dev", git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "nolocal_close" } flume = "*" [build-dependencies] diff --git a/build-resources/opaque-types/Cargo.lock b/build-resources/opaque-types/Cargo.lock index ce21a2965..cfc3b7ed7 100644 --- a/build-resources/opaque-types/Cargo.lock +++ b/build-resources/opaque-types/Cargo.lock @@ -117,6 +117,18 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-trait" version = "0.1.82" @@ -508,6 +520,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener-strategy" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "filepath" version = "0.1.2" @@ -3111,9 +3133,10 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "ahash", + "async-channel", "async-trait", "bytes", "flume", @@ -3158,7 +3181,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "zenoh-collections", ] @@ -3166,7 +3189,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "tracing", "uhlc", @@ -3178,12 +3201,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "json5", "num_cpus", @@ -3205,7 +3228,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "lazy_static", "tokio", @@ -3216,7 +3239,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "aes", "hmac", @@ -3229,7 +3252,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "bincode", "flume", @@ -3246,7 +3269,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "hashbrown", "keyed-set", @@ -3260,7 +3283,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -3280,7 +3303,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "flume", @@ -3304,7 +3327,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "base64 0.22.1", @@ -3330,7 +3353,7 @@ dependencies = [ [[package]] name = "zenoh-link-serial" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "tokio", @@ -3348,7 +3371,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "socket2", @@ -3365,7 +3388,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "base64 0.22.1", @@ -3394,7 +3417,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "socket2", @@ -3413,7 +3436,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixpipe" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "advisory-lock", "async-trait", @@ -3435,7 +3458,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "nix 0.29.0", @@ -3453,7 +3476,7 @@ dependencies = [ [[package]] name = "zenoh-link-vsock" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "libc", @@ -3471,7 +3494,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "futures-util", @@ -3491,7 +3514,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "proc-macro2", "quote", @@ -3502,7 +3525,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "git-version", "libloading", @@ -3518,7 +3541,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "const_format", "rand", @@ -3532,7 +3555,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "anyhow", ] @@ -3540,7 +3563,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "lazy_static", "ron", @@ -3553,7 +3576,7 @@ dependencies = [ [[package]] name = "zenoh-shm" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "advisory-lock", "async-trait", @@ -3576,7 +3599,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "event-listener", "futures", @@ -3589,7 +3612,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "futures", "tokio", @@ -3602,7 +3625,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "crossbeam-utils", @@ -3636,7 +3659,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44" +source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=nolocal_close#61420fcc083c3f1566f13447fa92d008d2bf0284" dependencies = [ "async-trait", "const_format", diff --git a/build-resources/opaque-types/Cargo.toml b/build-resources/opaque-types/Cargo.toml index 7ccb57ed0..3049e023d 100644 --- a/build-resources/opaque-types/Cargo.toml +++ b/build-resources/opaque-types/Cargo.toml @@ -30,9 +30,9 @@ panic = [ default = ["zenoh/default"] [dependencies] -zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features = ["internal"] } -zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", features=["internal"], branch = "main" } -zenoh-protocol = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } +zenoh = { version = "1.0.0-dev", git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "nolocal_close", default-features = false, features = ["internal"] } +zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/ZettaScaleLabs/zenoh.git", features=["internal"], branch = "nolocal_close" } +zenoh-protocol = { version = "1.0.0-dev", git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "nolocal_close" } const_format = "0.2.32" flume = "*" tokio = "*" diff --git a/build-resources/opaque-types/src/lib.rs b/build-resources/opaque-types/src/lib.rs index e5f958675..42b9c3534 100644 --- a/build-resources/opaque-types/src/lib.rs +++ b/build-resources/opaque-types/src/lib.rs @@ -195,7 +195,7 @@ get_opaque_type_data!(Session, z_loaned_session_t); #[cfg(feature = "unstable")] /// An owned Close handle -get_opaque_type_data!(Option>>, zc_owned_concurrent_close_handle_t); +get_opaque_type_data!(Option>>, zc_owned_concurrent_close_handle_t); /// An owned Zenoh configuration. get_opaque_type_data!(Option, z_owned_config_t); diff --git a/src/close.rs b/src/close.rs index de12254ac..afc7be1e2 100644 --- a/src/close.rs +++ b/src/close.rs @@ -14,7 +14,8 @@ use std::mem::MaybeUninit; -use zenoh_runtime::ZRuntime; +#[cfg(feature = "unstable")] +use zenoh::Wait; #[cfg(feature = "unstable")] use crate::opaque_types::zc_owned_concurrent_close_handle_t; @@ -26,7 +27,7 @@ use crate::{ #[cfg(feature = "unstable")] decl_c_type!( - owned(zc_owned_concurrent_close_handle_t, option tokio::task::JoinHandle>), + owned(zc_owned_concurrent_close_handle_t, option zenoh::internal::builders::close::NolocalJoinHandle>), ); /// @brief Blocking wait on close handle to complete. Returns `Z_EIO` if close finishes with error. @@ -35,7 +36,7 @@ decl_c_type!( pub unsafe extern "C" fn zc_concurrent_close_handle_wait( handle: &mut zc_moved_concurrent_close_handle_t, ) -> z_result_t { - match ZRuntime::Application.block_on(handle.take_rust_type().unwrap_unchecked()) { + match handle.take_rust_type().unwrap_unchecked().wait() { Ok(_) => Z_OK, Err(e) => { tracing::error!("Close error: {}", e);