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

Synchronize with SHM branch #11

Closed
wants to merge 56 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
8d0e3c8
Update style.yaml
Mallets Jul 23, 2024
62433e7
Update check_logging.yaml
Mallets Jul 23, 2024
4535aea
Update build.yaml
Mallets Jul 23, 2024
109864b
chore: configure the compiliation
YuanYuYuan Jun 20, 2024
c7724ff
chore: complete the 1st version
YuanYuYuan Jun 25, 2024
2af94a9
fix: memory leak
YuanYuYuan Jul 18, 2024
3ee8cd3
wip
YuanYuYuan Jul 25, 2024
e5f5b58
fix: z_error_t -> z_result_t
YuanYuYuan Jul 26, 2024
28f2fe8
Fix `scouting/*/autoconnect/*` per eclipse-zenoh/zenoh@b31a410 (#3)
fuzzypixelz Jul 24, 2024
ecf26fc
chore: checkout the local zenoh-c
YuanYuYuan Jul 30, 2024
b9b7cec
chore: polish z_open
YuanYuYuan Jul 31, 2024
d9cf6f9
fix: segfault
YuanYuYuan Jul 31, 2024
71700d7
feat: `z_bytes_serialize_from_slice` without copy
YuanYuYuan Jul 31, 2024
cc8b1d6
chore: switch back to https://github.com/eclipse-zenoh/zenoh-c
YuanYuYuan Jul 31, 2024
d261332
Initialize `query_` member of `ZenohQuery`
fuzzypixelz Jul 26, 2024
15ea139
refactor: use `z_owned_slice_t` instead
YuanYuYuan Jul 31, 2024
ced2c14
chore: adapt the latest change of zenoh-c dev/1.0.0
YuanYuYuan Aug 2, 2024
55efb74
chore: use `strncmp` to avoid copying
YuanYuYuan Aug 7, 2024
8505e34
refactor: use `z_view_keyexpr_t` to avoid copying
YuanYuYuan Aug 8, 2024
c43caf2
feat: implment the SHM feature
YuanYuYuan Aug 8, 2024
686dec1
Replaced ament_vendor with ExternalProject
imstevenpmwork Aug 13, 2024
62aad56
Merge commit 'dfc95ade620952af587dc55464d0697efad15301'
yellowhatter Aug 20, 2024
ccd69a3
merge fixes
yellowhatter Aug 20, 2024
8f36772
SHM feature support for build system
yellowhatter Aug 20, 2024
9fac5ee
Hide all shm stuff behind #ifdef RMW_ZENOH_BUILD_WITH_SHARED_MEMORY
yellowhatter Aug 20, 2024
d2cccf2
Update .gitignore
yellowhatter Aug 20, 2024
785eab0
Fix owned query handling
yellowhatter Aug 20, 2024
aace581
fix: segmentation fault due to the unallocated query memory
YuanYuYuan Aug 18, 2024
57fb755
configurable shm size
yellowhatter Aug 21, 2024
5ef8a70
fix Zenoh Config read\check
yellowhatter Aug 22, 2024
916ee65
Merge commit '5ef8a705cbac4beb136d44e076de45a4420ffa05'
yellowhatter Aug 22, 2024
be31a20
adopt to recent zenoh-c API changes
yellowhatter Aug 23, 2024
aff62d3
Merge commit 'be31a20eda3ee9325dff022df2d1480a243d274c'
yellowhatter Aug 23, 2024
2097c30
fix SHM feature passing through build system
yellowhatter Aug 23, 2024
94a014a
- refine SHM code, fix some bugs
yellowhatter Aug 26, 2024
e6da873
Merge commit 'af2e344dcef624e6460fca461aa1cc2357696917'
yellowhatter Aug 26, 2024
cadd258
Add configurable message size threshold for handling ROS messages thr…
yellowhatter Aug 26, 2024
3b31861
Merge commit '0225a59de4fe2f180291d94845071753269e2744'
yellowhatter Aug 27, 2024
991a1a5
- refactor buffer serialization code
yellowhatter Aug 28, 2024
abbe1be
Merge commit '36140fddac33317c87e9431a58b3ecf1345a0f4e'
yellowhatter Aug 28, 2024
28a930a
Merge branch 'dev/1.0.0' into dev/1.0.0-ci
evshary Aug 29, 2024
d696a60
Merge commit 'f60c2a2a2090311d803de4a7e2151f7ab6ce1433'
yellowhatter Aug 29, 2024
381b022
Merge commit '83a26f2d1911bbb61c786f445b3f4477e20e969b'
yellowhatter Aug 30, 2024
6496c5a
Merge commit '7dba6746caf17e01deb4301c9955e5631339f40e'
yellowhatter Sep 2, 2024
c983149
Merge branch 'dev/1.0.0' into dev/1.0.0-ci
evshary Sep 2, 2024
d1242c4
Merge commit 'c983149ec1eb343e31b9e5f5c8951403ae7365b0'
yellowhatter Sep 3, 2024
a0d7d02
wip on publication refactoring
yellowhatter Sep 5, 2024
9816f16
Merge commit '30aae8082407794f98b7158a5bc48e7c66eee633'
yellowhatter Sep 5, 2024
2f8b788
WIP on SHM (benchmarked)
yellowhatter Sep 11, 2024
7861708
Merge commit '6a48919727226ebad853373e8a1eec0ee22c3be4'
yellowhatter Sep 24, 2024
1ce3cf8
Update rmw_zenoh.cpp
yellowhatter Sep 25, 2024
01b34c5
codestyle
yellowhatter Sep 25, 2024
a0538f0
Codestyle
yellowhatter Sep 25, 2024
4739732
Update rmw_zenoh.cpp
yellowhatter Sep 25, 2024
728a094
Update rmw_zenoh.cpp
yellowhatter Sep 25, 2024
e49e22c
Merge commit 'afd7f638c64b6fc70e471cde02f63c16c065a4f5'
yellowhatter Oct 2, 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
Prev Previous commit
Next Next commit
Merge branch 'dev/1.0.0' into dev/1.0.0-ci
Signed-off-by: ChenYing Kuo <evshary@gmail.com>
  • Loading branch information
evshary committed Sep 2, 2024
commit c983149ec1eb343e31b9e5f5c8951403ae7365b0
8 changes: 5 additions & 3 deletions zenoh_c_vendor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set(ZENOHC_CARGO_FLAGS "--no-default-features$<SEMICOLON>--features=shared-memor
# - https://github.com/eclipse-zenoh/zenoh/pull/1150 (fix deadlock issue https://github.com/ros2/rmw_zenoh/issues/182)
# ament_vendor(zenoh_c_vendor
# VCS_URL https://github.com/eclipse-zenoh/zenoh-c
# VCS_VERSION dev/1.0.0
# VCS_VERSION main
# CMAKE_ARGS
# "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}"
# "-DZENOHC_CUSTOM_TARGET=${ZENOHC_CUSTOM_TARGET}"
Expand All @@ -36,7 +36,7 @@ set(ZENOHC_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
ExternalProject_Add(zenohc
PREFIX ${CMAKE_BINARY_DIR}/zenohc
GIT_REPOSITORY https://github.com/eclipse-zenoh/zenoh-c.git
GIT_TAG dev/1.0.0
GIT_TAG main
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${ZENOHC_INSTALL_DIR} -DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS} -DZENOHC_CUSTOM_TARGET=${ZENOHC_CUSTOM_TARGET}
BUILD_IN_SOURCE 1
)
Expand All @@ -45,4 +45,6 @@ add_custom_target(zenoh_c_vendor ALL
)
list(APPEND CMAKE_PREFIX_PATH ${ZENOHC_INSTALL_DIR})

ament_package()
ament_export_dependencies(zenohc)

ament_package()
You are viewing a condensed version of this merge commit. You can view the full changes here.