fix: rebase shenanigans

eclipse-zenoh · Nov 14, 2024 · d639917 · d639917
1 parent 6996c88
commit d639917
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 15 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -63,7 +63,7 @@ Z_FEATURE_RAWETH_TRANSPORT?=0
 # Buffer sizes
 FRAG_MAX_SIZE?=300000
 BATCH_UNICAST_SIZE?=65535
-BATCH_MULTICAST_SIZE?=8096
+BATCH_MULTICAST_SIZE?=8192
 
 # zenoh-pico/ directory
 ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))

diff --git a/include/zenoh-pico/config.h b/include/zenoh-pico/config.h
@@ -43,9 +43,9 @@
 #define Z_FEATURE_ENCODING_VALUES 1
 #define Z_FEATURE_TCP_NODELAY 1
 #define Z_FEATURE_LOCAL_SUBSCRIBER 0
-#define Z_FEATURE_PUBLISHER_SESSION_CHECK 1
+#define Z_FEATURE_PUBLISHER_SESSION_CHECK 0
 #define Z_FEATURE_BATCHING 1
-#define Z_FEATURE_RX_CACHE 0
+#define Z_FEATURE_RX_CACHE 1
 // End of CMake generation
 
 /*------------------ Runtime configuration properties ------------------*/

diff --git a/include/zenoh-pico/protocol/codec/transport.h b/include/zenoh-pico/protocol/codec/transport.h
@@ -18,8 +18,8 @@
 #include "zenoh-pico/protocol/definitions/transport.h"
 #include "zenoh-pico/protocol/iobuf.h"
 
-extern "C" {
 #ifdef __cplusplus
+extern "C" {
 #endif
 
 z_result_t _z_scouting_message_encode(_z_wbuf_t *buf, const _z_scouting_message_t *msg);
@@ -52,7 +52,7 @@ z_result_t _z_fragment_encode(_z_wbuf_t *wbf, uint8_t header, const _z_t_msg_fra
 z_result_t _z_fragment_decode(_z_t_msg_fragment_t *msg, _z_zbuf_t *zbf, uint8_t header);
 
 #ifdef __cplusplus
-#endif
 }
+#endif
 
 #endif /* INCLUDE_ZENOH_PICO_PROTOCOL_CODEC_TRANSPORT_H */
diff --git a/include/zenoh-pico/session/queryable.h b/include/zenoh-pico/session/queryable.h
@@ -24,7 +24,7 @@ typedef struct _z_session_rc_t _z_session_rc_t;
 
 // Queryable infos
 typedef struct {
-    _z_query_handler_t callback;
+    _z_closure_query_callback_t callback;
     void *arg;
 } _z_queryable_infos_t;
 

diff --git a/include/zenoh-pico/session/session.h b/include/zenoh-pico/session/session.h
@@ -89,7 +89,7 @@ typedef struct _z_query_t _z_query_t;
 /**
  * The callback signature of the functions handling query messages.
  */
-typedef void (*_z_closure_query_callback_t)(_z_query_rc_t *query, void *arg);
+typedef void (*_z_closure_query_callback_t)(_z_query_t *query, void *arg);
 
 typedef struct {
     _z_keyexpr_t _key;

diff --git a/include/zenoh-pico/session/subscription.h b/include/zenoh-pico/session/subscription.h
@@ -24,7 +24,7 @@ typedef struct _z_session_t _z_session_t;
 
 // Subscription infos
 typedef struct {
-    _z_sample_handler_t callback;
+    _z_closure_sample_callback_t callback;
     void *arg;
 } _z_subscription_infos_t;
 

diff --git a/include/zenoh-pico/transport/multicast/transport.h b/include/zenoh-pico/transport/multicast/transport.h
@@ -42,4 +42,4 @@ static inline void _z_multicast_peer_mutex_unlock(_z_transport_multicast_t *ztm)
 #ifdef __cplusplus
 }
 #endif
-#endif  /* ZENOH_PICO_MULTICAST_TRANSPORT_H */
+#endif /* ZENOH_PICO_MULTICAST_TRANSPORT_H */
diff --git a/include/zenoh-pico/transport/transport.h b/include/zenoh-pico/transport/transport.h
@@ -203,4 +203,4 @@ static inline void _z_transport_rx_mutex_unlock(_z_transport_common_t *ztc) { _Z
 #ifdef __cplusplus
 }
 #endif
-#endif  /* INCLUDE_ZENOH_PICO_TRANSPORT_TRANSPORT_H */
+#endif /* INCLUDE_ZENOH_PICO_TRANSPORT_TRANSPORT_H */
diff --git a/src/transport/multicast.c b/src/transport/multicast.c
@@ -27,6 +27,7 @@
 #include "zenoh-pico/transport/unicast/rx.h"
 #include "zenoh-pico/transport/utils.h"
 #include "zenoh-pico/utils/logging.h"
+#include "zenoh-pico/utils/uuid.h"
 
 #if Z_FEATURE_MULTICAST_TRANSPORT == 1
 void _zp_multicast_fetch_zid(const _z_transport_t *zt, _z_closure_zid_t *callback) {

diff --git a/src/transport/multicast/transport.c b/src/transport/multicast/transport.c
@@ -199,11 +199,11 @@ void _z_multicast_transport_clear(_z_transport_t *zt) {
     // Clean up tasks
     if (ztm->_common._read_task != NULL) {
         _z_task_join(ztm->_common._read_task);
-        _z_task_free(&ztm->_common._read_task);
+        z_free(ztm->_common._read_task);
     }
     if (ztm->_common._lease_task != NULL) {
         _z_task_join(ztm->_common._lease_task);
-        _z_task_free(&ztm->_common._lease_task);
+        z_free(ztm->_common._lease_task);
     }
     // Clean up the mutexes
     _z_mutex_drop(&ztm->_common._mutex_tx);

diff --git a/src/transport/unicast.c b/src/transport/unicast.c
@@ -26,6 +26,7 @@
 #include "zenoh-pico/transport/unicast/rx.h"
 #include "zenoh-pico/transport/utils.h"
 #include "zenoh-pico/utils/logging.h"
+#include "zenoh-pico/utils/uuid.h"
 
 #if Z_FEATURE_UNICAST_TRANSPORT == 1
 void _zp_unicast_fetch_zid(const _z_transport_t *zt, _z_closure_zid_t *callback) {

diff --git a/src/transport/unicast/transport.c b/src/transport/unicast/transport.c
@@ -329,11 +329,11 @@ void _z_unicast_transport_clear(_z_transport_t *zt) {
     // Clean up tasks
     if (ztu->_common._read_task != NULL) {
         _z_task_join(ztu->_common._read_task);
-        _z_task_free(&ztu->_common._read_task);
+        z_free(ztu->_common._read_task);
     }
     if (ztu->_common._lease_task != NULL) {
         _z_task_join(ztu->_common._lease_task);
-        _z_task_free(&ztu->_common._lease_task);
+        z_free(ztu->_common._lease_task);
     }
 
     // Clean up the mutexes

diff --git a/zenohpico.pc b/zenohpico.pc
@@ -3,6 +3,6 @@ prefix=/usr/local
 Name: zenohpico
 Description: 
 URL: 
-Version: 1.0.20241018dev
+Version: 1.0.20241113dev
 Cflags: -I${prefix}/include
 Libs: -L${prefix}/lib -lzenohpico