Skip to content

Commit

Permalink
Merge branch 'master' into simplified_load_plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
milyin committed Dec 1, 2023
2 parents fc53c38 + c0ebfff commit 5df923c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
12 changes: 10 additions & 2 deletions DEFAULT_CONFIG.json5
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,25 @@
/// NOTE: Due to the note above, 'lowlatency' is incompatible with 'qos' option, so in order to
/// enable 'lowlatency' you need to explicitly disable 'qos'.
lowlatency: false,
/// Enables QoS on unicast communications.
qos: {
enabled: true,
},
/// Enables compression on unicast communications.
/// Compression capabilities are negotiated during session establishment.
/// If both Zenoh nodes support compression, then compression is activated.
compression: {
enabled: false,
},
},
},
multicast: {
/// Enables QoS on multicast communication.
/// Default to false for Zenoh-to-Zenoh-Pico out-of-the-box compatibility.
qos: {
enabled: true,
enabled: false,
},
/// Enables compression on multicast communication.
/// Default to false for Zenoh-to-Zenoh-Pico out-of-the-box compatibility.
compression: {
enabled: false,
},
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-util/src/std_only/lib_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ zconfigurable! {
/// The libraries suffix for the current platform (`".dll"` or `".so"` or `".dylib"`...)
pub static ref LIB_SUFFIX: String = DLL_SUFFIX.to_string();
/// The default list of paths where to search for libraries to load
pub static ref LIB_DEFAULT_SEARCH_PATHS: String = "/usr/local/lib:/usr/lib:~/.zenoh/lib:.".to_string();
pub static ref LIB_DEFAULT_SEARCH_PATHS: String = "/usr/local/lib:/usr/lib:/opt/homebrew/lib:~/.zenoh/lib:.".to_string();
}

/// LibLoader allows search for librairies and to load them.
Expand Down
1 change: 1 addition & 0 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ categories = { workspace = true }
description = "Internal crate for zenoh."
readme = "README.md"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
publish = false

[features]
shared-memory = ["zenoh/shared-memory"]
Expand Down
2 changes: 1 addition & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,4 @@
or
```bash
z_sub_liveliness -k group1/**
```
```
1 change: 1 addition & 0 deletions plugins/example-plugin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ name = "zenoh-plugin-example"
version = { workspace = true }
authors = { workspace = true }
edition = { workspace = true }
publish = false

[features]
default = ["no_mangle"]
Expand Down
2 changes: 0 additions & 2 deletions zenoh/src/net/runtime/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ impl Runtime {

pub(crate) async fn init(config: Config) -> ZResult<Runtime> {
log::debug!("Zenoh Rust API {}", GIT_VERSION);
// Make sure to have have enough threads spawned in the async futures executor
zasync_executor_init!();

let zid = *config.id();

Expand Down

0 comments on commit 5df923c

Please sign in to comment.