wip

Author: steils

include/zenoh-pico/net/primitives.h

@@ -149,7 +149,7 @@ z_result_t _z_write(_z_session_t *zn, const _z_keyexpr_t *keyexpr, const _z_byte
                     const _z_encoding_t *encoding, const z_sample_kind_t kind, const z_congestion_control_t cong_ctrl,
                     z_priority_t priority, bool is_express, const _z_timestamp_t *timestamp,
                     const _z_bytes_t *attachment, z_reliability_t reliability, const _z_source_info_t *source_info,
-                    z_locality_t allowed_destination, bool *delivered_locally);
+                    z_locality_t allowed_destination);
 #endif
 
 #if Z_FEATURE_SUBSCRIPTION == 1

src/api/api.c

@@ -990,7 +990,7 @@ z_result_t z_put(const z_loaned_session_t *zs, const z_loaned_keyexpr_t *keyexpr
 #endif
     ret = _z_write(_Z_RC_IN_VAL(zs), &keyexpr_aliased, payload_bytes, encoding, Z_SAMPLE_KIND_PUT,
                    opt.congestion_control, opt.priority, opt.is_express, opt.timestamp, attachment_bytes, reliability,
-                   source_info, allowed_destination, NULL);
+                   source_info, allowed_destination);
 
 #if Z_FEATURE_LOCAL_SUBSCRIBER == 1
     z_encoding_drop(opt.encoding);
@@ -1052,7 +1052,7 @@ z_result_t z_delete(const z_loaned_session_t *zs, const z_loaned_keyexpr_t *keye
 #endif
     ret = _z_write(_Z_RC_IN_VAL(zs), &keyexpr_aliased, &dummy_payload, NULL, Z_SAMPLE_KIND_DELETE,
                    opt.congestion_control, opt.priority, opt.is_express, opt.timestamp, &dummy_payload, reliability,
-                   source_info, allowed_destination, NULL);
+                   source_info, allowed_destination);
 
 #if Z_FEATURE_LOCAL_SUBSCRIBER == 0
     _z_timestamp_t local_timestamp = (opt.timestamp != NULL) ? *opt.timestamp : _z_timestamp_null();
@@ -1215,7 +1215,7 @@ z_result_t _z_publisher_put_impl(const z_loaned_publisher_t *pub, z_moved_bytes_
             // Write value
             ret = _z_write(session, &pub_keyexpr, payload_bytes, &encoding, Z_SAMPLE_KIND_PUT, pub->_congestion_control,
                            pub->_priority, pub->_is_express, opt.timestamp, attachment_bytes, reliability, source_info,
-                           pub->_allowed_destination, NULL);
+                           pub->_allowed_destination);
 #if Z_FEATURE_LOCAL_SUBSCRIBER == 1
             wrote = true;
 #endif
@@ -1339,7 +1339,7 @@ z_result_t _z_publisher_delete_impl(const z_loaned_publisher_t *pub, const z_pub
         !_z_write_filter_active(&pub->_filter)) {
         ret = _z_write(session, &pub_keyexpr, &dummy_payload, NULL, Z_SAMPLE_KIND_DELETE, pub->_congestion_control,
                        pub->_priority, pub->_is_express, opt.timestamp, &dummy_payload, reliability, source_info,
-                       pub->_allowed_destination, NULL);
+                       pub->_allowed_destination);
     }
 
 #if Z_FEATURE_LOCAL_SUBSCRIBER == 0

src/net/primitives.c

@@ -198,22 +198,18 @@ z_result_t _z_write(_z_session_t *zn, const _z_keyexpr_t *keyexpr, const _z_byte
                     const _z_encoding_t *encoding, z_sample_kind_t kind, z_congestion_control_t cong_ctrl,
                     z_priority_t priority, bool is_express, const _z_timestamp_t *timestamp,
                     const _z_bytes_t *attachment, z_reliability_t reliability, const _z_source_info_t *source_info,
-                    z_locality_t allowed_destination, bool *delivered_locally) {
+                    z_locality_t allowed_destination) {
     z_result_t ret = _Z_RES_OK;
     _z_qos_t qos = _z_n_qos_make(is_express, cong_ctrl == Z_CONGESTION_CONTROL_BLOCK, priority);
-    bool local_delivery = false;
 
 #if Z_FEATURE_LOCAL_SUBSCRIBER == 1
     if (_z_locality_allows_local(allowed_destination)) {
-        local_delivery = _z_session_deliver_push_locally(zn, keyexpr, payload, encoding, kind, qos, timestamp,
-                                                         attachment, reliability, source_info, allowed_destination);
+        _z_session_deliver_push_locally(zn, keyexpr, payload, encoding, kind, qos, timestamp, attachment, reliability,
+                                        source_info, allowed_destination);
     }
 #endif
 
     if (!_z_locality_allows_remote(allowed_destination)) {
-        if (delivered_locally != NULL) {
-            *delivered_locally = local_delivery;
-        }
         return _Z_RES_OK;
     }
 
@@ -233,9 +229,6 @@ z_result_t _z_write(_z_session_t *zn, const _z_keyexpr_t *keyexpr, const _z_byte
         _Z_ERROR_LOG(_Z_ERR_TRANSPORT_TX_FAILED);
         ret = _Z_ERR_TRANSPORT_TX_FAILED;
     }
-    if (delivered_locally != NULL) {
-        *delivered_locally = local_delivery;
-    }
     // Freeing z_msg is unnecessary, as all of its components are aliased
     return ret;
 }

tests/z_local_loopback_test.c

@@ -434,9 +434,9 @@ static void test_put_local_and_remote(void) {
     _z_source_info_t source_info = _z_source_info_null();
 
     // Session-local only delivery should not touch transport
-    z_result_t res = _z_write(&g_session, &keyexpr, &payload, &encoding, Z_SAMPLE_KIND_PUT, Z_CONGESTION_CONTROL_BLOCK,
-                              Z_PRIORITY_DEFAULT, false, &ts, NULL, Z_RELIABILITY_RELIABLE, &source_info,
-                              Z_LOCALITY_SESSION_LOCAL, NULL);
+    z_result_t res =
+        _z_write(&g_session, &keyexpr, &payload, &encoding, Z_SAMPLE_KIND_PUT, Z_CONGESTION_CONTROL_BLOCK,
+                 Z_PRIORITY_DEFAULT, false, &ts, NULL, Z_RELIABILITY_RELIABLE, &source_info, Z_LOCALITY_SESSION_LOCAL);
     assert(res == _Z_RES_OK);
     assert(atomic_load_explicit(&g_local_put_delivery_count, memory_order_relaxed) == 1);
     assert(atomic_load_explicit(&g_network_send_count, memory_order_relaxed) == 0);
@@ -445,7 +445,7 @@ static void test_put_local_and_remote(void) {
     atomic_store_explicit(&g_local_put_delivery_count, 0, memory_order_relaxed);
     atomic_store_explicit(&g_network_send_count, 0, memory_order_relaxed);
     res = _z_write(&g_session, &keyexpr, &payload, &encoding, Z_SAMPLE_KIND_PUT, Z_CONGESTION_CONTROL_BLOCK,
-                   Z_PRIORITY_DEFAULT, false, &ts, NULL, Z_RELIABILITY_RELIABLE, &source_info, Z_LOCALITY_ANY, NULL);
+                   Z_PRIORITY_DEFAULT, false, &ts, NULL, Z_RELIABILITY_RELIABLE, &source_info, Z_LOCALITY_ANY);
     assert(res == _Z_RES_OK);
     assert(atomic_load_explicit(&g_local_put_delivery_count, memory_order_relaxed) == 1);
     assert(atomic_load_explicit(&g_network_send_count, memory_order_relaxed) == 1);
@@ -617,7 +617,7 @@ static void test_put_remote_only_destination(void) {
 
     z_result_t res =
         _z_write(&g_session, &keyexpr, &payload, &encoding, Z_SAMPLE_KIND_PUT, Z_CONGESTION_CONTROL_BLOCK,
-                 Z_PRIORITY_DEFAULT, false, &ts, NULL, Z_RELIABILITY_RELIABLE, &source_info, Z_LOCALITY_REMOTE, NULL);
+                 Z_PRIORITY_DEFAULT, false, &ts, NULL, Z_RELIABILITY_RELIABLE, &source_info, Z_LOCALITY_REMOTE);
     assert(res == _Z_RES_OK);
     assert(atomic_load_explicit(&g_local_put_delivery_count, memory_order_relaxed) == 0);
     assert(atomic_load_explicit(&g_network_send_count, memory_order_relaxed) == 1);
@@ -653,7 +653,7 @@ static void test_subscriber_remote_only_origin(void) {
 
     z_result_t res =
         _z_write(&g_session, &keyexpr, &payload, &encoding, Z_SAMPLE_KIND_PUT, Z_CONGESTION_CONTROL_BLOCK,
-                 Z_PRIORITY_DEFAULT, false, &ts, NULL, Z_RELIABILITY_RELIABLE, &source_info, Z_LOCALITY_ANY, NULL);
+                 Z_PRIORITY_DEFAULT, false, &ts, NULL, Z_RELIABILITY_RELIABLE, &source_info, Z_LOCALITY_ANY);
     assert(res == _Z_RES_OK);
     assert(atomic_load_explicit(&g_local_put_delivery_count, memory_order_relaxed) == 0);
     assert(atomic_load_explicit(&g_network_send_count, memory_order_relaxed) == 1);