Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adopted shm api #405

Merged
merged 59 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
7087572
Adopted SHM API
yellowhatter May 15, 2024
610ebe8
Merge commit '71f766ed135d5c1189c20eaab05d6129cc1c356a'
yellowhatter May 15, 2024
0b5a503
- Dynamic polymorphism for SHM provider and layout
yellowhatter May 17, 2024
ae40c25
Merge commit '9b540002caf6d9c03200213a60541bbbf1d61da3'
yellowhatter May 17, 2024
c334bf7
Big SHM API brush-up and tests
yellowhatter May 23, 2024
11a546e
Merge commit '2d98ba86f1b8c6d8b6d289ce33bbb51b26815a23'
yellowhatter May 24, 2024
0dece15
- more additions to the API
yellowhatter May 25, 2024
5e1941e
switch to dev/1.0.0 zenoh
yellowhatter May 25, 2024
453f58a
Merge commit '78a078d8b2a5268064360d7783a066b1b775c75b'
yellowhatter May 25, 2024
dfd2714
Update Context description
yellowhatter May 25, 2024
a513342
add comments to shm tests
yellowhatter May 27, 2024
92ac140
Merge commit '85f6c655564fb73e1151987430cb95318f4eca26'
yellowhatter May 27, 2024
e3d38d3
Merge commit '8bf9cd90cd941f09f6ec6d59d122e254d5d46d76'
yellowhatter May 28, 2024
1f99ad7
- shm to session API integration
yellowhatter May 28, 2024
70eff89
Merge commit '9561b6e97898e58dabc8ffea438a0283f6e5adbc'
yellowhatter May 28, 2024
2688a6b
async allocation API
yellowhatter May 28, 2024
d68a64c
- improve testing coverage
yellowhatter May 29, 2024
908194e
WIP on build system adoption
yellowhatter May 29, 2024
a992968
Merge commit 'e54001cf3c84c1e146a6cc3663212ba62c526cde'
yellowhatter May 29, 2024
1b63606
merge fix
yellowhatter May 29, 2024
78d44be
Rollback to default "shared-memory" in internals
yellowhatter May 29, 2024
fdfd54c
switch back to unconditional shared-memory API compilation
yellowhatter May 30, 2024
d856bd2
Merge commit 'eaa65cab19ed5ef4a49ce301c6bf2708cc9c566e'
yellowhatter May 30, 2024
0beb20c
Merge commit '01792927b39abd0cc07e995bb409e57d71b4c98f'
yellowhatter May 30, 2024
53e3dd4
switch to dev/1.0.0 zenoh
yellowhatter May 30, 2024
d7f4f77
Merge commit 'ce0b7c2de041d4e8421c5f27d6751a151f28c72c'
yellowhatter May 30, 2024
2e6cae9
zenoh prelude fix
yellowhatter May 30, 2024
81bb7ce
fix fmt warnings
yellowhatter May 31, 2024
55ae513
fix checks
yellowhatter May 31, 2024
67c8d3c
fix platform specific codegen
yellowhatter May 31, 2024
fe82372
wip on codegen
yellowhatter May 31, 2024
fbe781f
wip on codegen
yellowhatter May 31, 2024
aeecf87
Code review fixes
yellowhatter May 31, 2024
e780e2d
Merge commit 'da06e5ed9c94542b5d78db6279ef048cae907cac'
yellowhatter May 31, 2024
01cfe65
Merge commit '9d3090c589760bd5e52bb57341a0abb63625dd55'
yellowhatter Jun 3, 2024
3d5bbd6
Merge commit '918eb811dc2c9b9f92b520eeeb0c729600467a5a'
yellowhatter Jun 3, 2024
b04b781
wip on feature support
yellowhatter Jun 3, 2024
6c9c6bc
Option<ZBytes> => ZBytes
yellowhatter Jun 3, 2024
267114b
Merge commit '6c9c6bc4435ddf0623a8418cf8c5292d3ec91116'
yellowhatter Jun 3, 2024
4b0cff5
fix clippy
yellowhatter Jun 3, 2024
16d90de
Merge commit '4b0cff575e5e0e3a2d6cd28253bd2c03f5e72c4f'
yellowhatter Jun 3, 2024
a12578c
allow z_bytes_encode_from_iter and z_bytes_encode_from_pair to accept…
DenisBiryukov91 Jun 3, 2024
eada3c7
WIP on rust feature support
yellowhatter Jun 3, 2024
a4f7e85
WIP on SHM feature support
yellowhatter Jun 3, 2024
f97becc
fmt
DenisBiryukov91 Jun 4, 2024
2d018db
SHM feature support
yellowhatter Jun 4, 2024
21654f6
Merge commit 'f97becc7a7c1e836b2d7bc507d7cfe3cf8bf6f5b'
yellowhatter Jun 4, 2024
03b0b25
use opaque_types to generate layout for SHM provider
yellowhatter Jun 4, 2024
ce2743c
use opaque_types for SHM AllocLayout
yellowhatter Jun 4, 2024
d1f2fb6
Merge commit '7e199676a2210ae7ee059201e535cac8504831a7'
yellowhatter Jun 4, 2024
da39382
Update build.rs
yellowhatter Jun 4, 2024
c4c5e83
fix default_features test
yellowhatter Jun 4, 2024
7cd412a
fix get
yellowhatter Jun 4, 2024
fad7a85
build system fixes for macos compatibility
yellowhatter Jun 4, 2024
793e6eb
macos build fix (thanks, Denis)
yellowhatter Jun 5, 2024
fe22202
- review fixes
yellowhatter Jun 5, 2024
eb43353
- add feature support to splitguide
yellowhatter Jun 5, 2024
7fcf66a
Merge commit 'dca3ce91ac8361875c11710fefb5882aa0634683'
yellowhatter Jun 6, 2024
94205c5
Merge commit '0826c5e9ab078fb0536fdcd6376071c625d32e8a'
yellowhatter Jun 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
cmake --build . --config Release

- name: Run rust tests
run: cargo test --verbose --release --features=logger-autoinit --features=shared-memory
run: cargo test --verbose --release --features=logger-autoinit

- name: Upload artifact
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ enable_testing()
#
declare_cache_var_true_if_vscode(ZENOHC_BUILD_IN_SOURCE_TREE "Do build inside source tree")
declare_cache_var(ZENOHC_BUILD_WITH_LOGGER_AUTOINIT TRUE BOOL "Enable logger-autoinit zenoh-c feature")
declare_cache_var(ZENOHC_BUILD_WITH_SHARED_MEMORY TRUE BOOL "Enable shared-memory zenoh-c feature")
declare_cache_var(ZENOHC_BUILD_WITH_SHARED_MEMORY FALSE BOOL "Enable shared-memory zenoh-c feature")
declare_cache_var(ZENOHC_CUSTOM_TARGET "" STRING "Rust target for cross compilation, 'aarch64-unknown-linux-gnu' for example")
declare_cache_var(ZENOHC_CARGO_CHANNEL "" STRING "Cargo channel parameter. Should be '+stable', '+nightly' or empty value")
declare_cache_var(ZENOHC_CARGO_FLAGS "" STRING "Additional cargo flags")
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ build = "build.rs"

[features]
logger-autoinit = []
shared-memory = ["zenoh/shared-memory"]
default = ["zenoh/default"]
shared-memory = ["zenoh/shared-memory", "zenoh-ext/shared-memory", "zenoh-protocol/shared-memory"]
unstable = ["zenoh/unstable", "zenoh-ext/unstable"]
default = ["zenoh/default", "unstable"]

[badges]
maintenance = { status = "actively-developed" }
Expand All @@ -52,11 +53,10 @@ rand = "0.8.5"
spin = "0.9.5"
unwrap-infallible = "0.1.5"
const_format = "0.2.32"
# shared-memory enabled for zenoh even if zenoh-c "shared-memory" feature is disabled. This is to make "std::mem::transmute" work for `ZSLice`
zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = ["shared-memory", "unstable"], default-features = false }
zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = ["shared-memory"] }
zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", default-features = false }
zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = ["unstable"] }
zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
flume = "*"

[build-dependencies]
Expand All @@ -68,7 +68,7 @@ fs_extra = "1.3.0"

[lib]
path="src/lib.rs"
name = "zenohc"
name = "zenohcd"
crate-type = ["cdylib", "staticlib"]
doctest = false

Expand Down
12 changes: 6 additions & 6 deletions Cargo.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ build = "@[email protected]"

[features]
logger-autoinit = []
shared-memory = ["zenoh/shared-memory"]
default = ["zenoh/default"]
shared-memory = ["zenoh/shared-memory", "zenoh-ext/shared-memory", "zenoh-protocol/shared-memory"]
unstable = ["zenoh/unstable", "zenoh-ext/unstable"]
default = ["zenoh/default", "unstable"]

[badges]
maintenance = { status = "actively-developed" }
Expand All @@ -52,11 +53,10 @@ rand = "0.8.5"
spin = "0.9.5"
unwrap-infallible = "0.1.5"
const_format = "0.2.32"
# shared-memory enabled for zenoh even if zenoh-c "shared-memory" feature is disabled. This is to make "std::mem::transmute" work for `ZSLice`
zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = ["shared-memory", "unstable"], default-features = false }
zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = ["shared-memory"] }
zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", default-features = false }
zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = ["unstable"] }
zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
flume = "*"

[build-dependencies]
Expand Down
Loading
Loading