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.

Sign up for GitHub

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

Enable querier for zenoh-pico #380

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Enable querier for zenoh-pico #380

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f77d1b
Enable querier for zenoh-pico
sashacmc Jan 24, 2025
b5a3fdf
Disable querier when ZENOHPICO_FEATURE_QUERY disabled
sashacmc Jan 24, 2025
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
3 changes: 3 additions & 0 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ function(add_examples glob mode lib)
if ((${file} MATCHES "^.*liveliness.*$") AND NOT(ZENOHPICO_FEATURE_LIVELINESS))
continue()
endif()
if ((${file} MATCHES "^.*querier.*$") AND NOT(ZENOHPICO_BUILD_WITH_UNSTABLE_API))
continue()
endif()
endif()

add_example(${file} ${mode} ${lib})
Expand Down
2 changes: 1 addition & 1 deletion examples/zenohc/z_querier.cxx → examples/universal/z_querier.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ int _main(int argc, char **argv) {
.named_value({"t", "target"}, "TARGET", "Query target (BEST_MATCHING | ALL | ALL_COMPLETE)",
"BEST_MATCHING")
.named_value({"o", "timeout"}, "TIMEOUT", "Timeout in ms (number)", "10000")
#if defined(Z_FEATURE_UNSTABLE_API)
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
.named_flag({"add-matching-listener"}, "Add matching listener")
#endif
.run();
Expand Down
2 changes: 1 addition & 1 deletion include/zenoh/api.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "api/session.hxx"
#include "api/subscriber.hxx"
#include "api/timestamp.hxx"
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
#if defined(Z_FEATURE_UNSTABLE_API)
#include "api/querier.hxx"
#endif
#if defined(Z_FEATURE_SHARED_MEMORY) && defined(Z_FEATURE_UNSTABLE_API)
Expand Down
2 changes: 1 addition & 1 deletion include/zenoh/api/querier.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,4 @@ class Querier : public Owned<::z_owned_querier_t> {
};

} // namespace zenoh
#endif
#endif
4 changes: 2 additions & 2 deletions include/zenoh/api/session.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "query_consolidation.hxx"
#include "subscriber.hxx"
#include "timestamp.hxx"
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
#if defined(Z_FEATURE_UNSTABLE_API)
#include "querier.hxx"
#endif
#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_SHARED_MEMORY) && defined(Z_FEATURE_UNSTABLE_API)
Expand Down Expand Up @@ -702,7 +702,7 @@ class Session : public Owned<::z_owned_session_t> {
}
#endif

#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
#if defined(Z_FEATURE_UNSTABLE_API)
/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future
/// release.
/// @brief Options to be passed when declaring a ``Querier``.
Expand Down
2 changes: 1 addition & 1 deletion zenoh-pico
Open in desktop
Submodule zenoh-pico updated 20 files
+1 −1 CMakeLists.txt
+40 −0 docs/api.rst
+1 −0 examples/CMakeLists.txt
+174 −0 examples/unix/c11/z_querier.c
+22 −0 include/zenoh-pico/api/macros.h
+70 −0 include/zenoh-pico/api/primitives.h
+42 −0 include/zenoh-pico/api/types.h
+35 −0 include/zenoh-pico/net/primitives.h
+25 −0 include/zenoh-pico/net/query.h
+1 −0 include/zenoh-pico/session/liveliness.h
+139 −4 src/api/api.c
+5 −6 src/net/liveliness.c
+38 −10 src/net/primitives.c
+20 −1 src/net/query.c
+22 −0 src/session/liveliness.c
+5 −0 src/transport/multicast/lease.c
+5 −0 src/transport/unicast/lease.c
+60 −1 tests/connection_restore.py
+4 −0 tests/memory_leak.py
+1 −1 version.txt
Loading