Add owned_query entity

include/zenoh-pico/api/types.h

@@ -191,6 +191,14 @@ typedef struct {
 } z_queryable_t;
 _OWNED_TYPE_PTR(_z_queryable_t, queryable)
 
+/**
+ * Represents a Zenoh query entity, received by Zenoh Queryable entities.
+ *
+ */
+typedef struct z_query_t {
+    z_owned_query_t _val;
+} z_query_t;
+
 /**
  * Represents the encoding of a payload, in a MIME-like format.
  *

include/zenoh-pico/net/primitives.h

@@ -211,7 +211,7 @@ int8_t _z_undeclare_queryable(_z_queryable_t *qle);
  *     key: The resource key of this reply. The caller keeps the ownership.
  *     payload: The value of this reply, the caller keeps ownership.
  */
-int8_t _z_send_reply(const z_query_t *query, const _z_keyexpr_t keyexpr, const _z_value_t payload);
+int8_t _z_send_reply(const _z_query_t *query, const _z_keyexpr_t keyexpr, const _z_value_t payload);
 #endif
 
 #if Z_FEATURE_QUERY == 1

include/zenoh-pico/net/query.h

@@ -23,14 +23,24 @@
 /**
  * The query to be answered by a queryable.
  */
-typedef struct z_query_t {
+typedef struct _z_query_t {
     _z_value_t _value;
     _z_keyexpr_t _key;
     uint32_t _request_id;
     _z_session_t *_zn;
     char *_parameters;
     _Bool _anyke;
-} z_query_t;
+} _z_query_t;
+
+void _z_query_clear(_z_query_t *q);
+_Z_REFCOUNT_DEFINE(_z_query, _z_query)
+
+/**
+ * Container for an owned query rc
+ */
+typedef struct {
+    _z_query_rc_t _rc;
+} z_owned_query_t;
 
 /**
  * Return type when declaring a queryable.

src/api/api.c

@@ -291,13 +291,14 @@
 z_query_consolidation_t z_query_consolidation_default(void) { return z_query_consolidation_auto(); }
 
 z_bytes_t z_query_parameters(const z_query_t *query) {
-    z_bytes_t parameters = _z_bytes_wrap((uint8_t *)query->_parameters, strlen(query->_parameters));
+    z_bytes_t parameters =
+        _z_bytes_wrap((uint8_t *)query->_val._rc.in->val._parameters, strlen(query->_val._rc.in->val._parameters));
     return parameters;
 }
 
-z_value_t z_query_value(const z_query_t *query) { return query->_value; }
+z_value_t z_query_value(const z_query_t *query) { return query->_val._rc.in->val._value; }
 
-z_keyexpr_t z_query_keyexpr(const z_query_t *query) { return query->_key; }
+z_keyexpr_t z_query_keyexpr(const z_query_t *query) { return query->_val._rc.in->val._key; }
 
 _Bool z_value_is_initialized(z_value_t *value) {
     _Bool ret = false;
@@ -917,7 +918,7 @@
                                 .len = payload_len,
                             },
                         .encoding = {.prefix = opts.encoding.prefix, .suffix = opts.encoding.suffix}};
-    return _z_send_reply(query, keyexpr, value);
+    return _z_send_reply(&query->_val._rc.in->val, keyexpr, value);
     return _Z_ERR_GENERIC;
 }
 #endif

src/net/primitives.c

@@ -327,7 +327,7 @@
     return _Z_RES_OK;
 }
 
-int8_t _z_send_reply(const z_query_t *query, _z_keyexpr_t keyexpr, const _z_value_t payload) {
+int8_t _z_send_reply(const _z_query_t *query, _z_keyexpr_t keyexpr, const _z_value_t payload) {
     int8_t ret = _Z_RES_OK;
 
     _z_keyexpr_t q_ke;

src/net/query.c

@@ -13,6 +13,10 @@
 
 #include "zenoh-pico/net/query.h"
 
+void _z_query_clear(_z_query_t *q) {
+    _ZP_UNUSED(q);  // Nothing to do
+}
+
 #if Z_FEATURE_QUERYABLE == 1
 void _z_queryable_clear(_z_queryable_t *qbl) {
     // Nothing to clear

src/session/queryable.c

@@ -16,6 +16,7 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "zenoh-pico/api/types.h"
 #include "zenoh-pico/config.h"
 #include "zenoh-pico/net/query.h"
 #include "zenoh-pico/protocol/core.h"
@@ -155,8 +156,8 @@
         zp_mutex_unlock(&zn->_mutex_inner);
 #endif  // Z_FEATURE_MULTI_THREAD == 1
 
-        // Build the query
-        z_query_t q;
+        // Build the _z_query
+        _z_query_t q;
         q._zn = zn;
         q._request_id = qid;
         q._key = key;
@@ -171,13 +172,17 @@
         q._value.encoding = query->_ext_value.encoding;
         q._value.payload = query->_ext_value.payload;
         q._anyke = (strstr(q._parameters, Z_SELECTOR_QUERY_MATCH) == NULL) ? false : true;
+
+        // Build the z_query
+        z_query_t query = {._val = {._rc = _z_query_rc_new_from_val(q)}};
+
         _z_questionable_rc_list_t *xs = qles;
         while (xs != NULL) {
             _z_questionable_rc_t *qle = _z_questionable_rc_list_head(xs);
-            qle->in->val._callback(&q, qle->in->val._arg);
+            qle->in->val._callback(&query, qle->in->val._arg);
             xs = _z_questionable_rc_list_tail(xs);
         }
-
+        _z_query_rc_drop(&query._val._rc);
         _z_keyexpr_clear(&key);
         _z_questionable_rc_list_free(&qles);
 #if defined(__STDC_NO_VLA__) || ((__STDC_VERSION__ < 201000L) && (defined(_WIN32) || defined(WIN32)))