Enable querier for zenoh-pico (#380)

* Enable querier for zenoh-pico * Disable querier when ZENOHPICO_FEATURE_QUERY disabled
eclipse-zenoh · Jan 27, 2025 · 2256f15 · 2256f15
1 parent 289de20
commit 2256f15
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -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_FEATURE_QUERY) OR NOT(ZENOHPICO_BUILD_WITH_UNSTABLE_API)))
+				continue()
+			endif()
 		endif()
 
 		add_example(${file} ${mode} ${lib})

diff --git a/examples/zenohc/z_querier.cxx → examples/universal/z_querier.cxx b/examples/zenohc/z_querier.cxx → examples/universal/z_querier.cxx
@@ -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();

diff --git a/include/zenoh/api.hxx b/include/zenoh/api.hxx
@@ -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(ZENOHCXX_ZENOHC) || Z_FEATURE_QUERY == 1) && defined(Z_FEATURE_UNSTABLE_API)
 #include "api/querier.hxx"
 #endif
 #if defined(Z_FEATURE_SHARED_MEMORY) && defined(Z_FEATURE_UNSTABLE_API)

diff --git a/include/zenoh/api/querier.hxx b/include/zenoh/api/querier.hxx
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#if defined(ZENOHCXX_ZENOHC)
+#if (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_QUERY == 1) && defined(Z_FEATURE_UNSTABLE_API)
 
 #include "../detail/closures_concrete.hxx"
 #include "base.hxx"
@@ -253,4 +253,4 @@ class Querier : public Owned<::z_owned_querier_t> {
 };
 
 }  // namespace zenoh
-#endif
+#endif
diff --git a/include/zenoh/api/session.hxx b/include/zenoh/api/session.hxx
@@ -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(ZENOHCXX_ZENOHC) || Z_FEATURE_QUERY == 1) && defined(Z_FEATURE_UNSTABLE_API)
 #include "querier.hxx"
 #endif
 #if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_SHARED_MEMORY) && defined(Z_FEATURE_UNSTABLE_API)
@@ -702,7 +702,7 @@ class Session : public Owned<::z_owned_session_t> {
     }
 #endif
 
-#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
+#if (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_QUERY == 1) && 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``.

diff --git a/zenoh-pico b/zenoh-pico
+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