code cleanup: replacement of lots of function-like macros by inline functions, removal of unnecessary casts

Signed-off-by: Erik Boasson <eb@ilities.com>

src/core/ddsi/CMakeLists.txt

@@ -79,7 +79,6 @@ PREPEND(hdrs_private_ddsi "${CMAKE_CURRENT_LIST_DIR}/include/ddsi"
     ddsi_tkmap.h
     probes-constants.h
     q_addrset.h
-    q_align.h
     q_bitset.h
     q_bswap.h
     q_config.h

src/core/ddsi/include/ddsi/ddsi_tran.h

@@ -178,27 +178,6 @@ struct ddsi_tran_qos
   int m_diffserv;
 };
 
-/* Functions and pseudo functions (macro wrappers) */
-
-void ddsi_factory_conn_init (ddsi_tran_factory_t, ddsi_tran_conn_t);
-
-#define ddsi_tran_type(b) (((ddsi_tran_base_t) (b))->m_trantype)
-#define ddsi_tran_port(b) (((ddsi_tran_base_t) (b))->m_port)
-int ddsi_tran_locator (ddsi_tran_base_t base, nn_locator_t * loc);
-void ddsi_tran_free (ddsi_tran_base_t base);
-void ddsi_tran_free_qos (ddsi_tran_qos_t qos);
-ddsi_tran_qos_t ddsi_tran_create_qos (void);
-os_socket ddsi_tran_handle (ddsi_tran_base_t base);
-
-#define ddsi_factory_create_listener(f,p,q) (((f)->m_create_listener_fn) ((p), (q)))
-#define ddsi_factory_supports(f,k) (((f)->m_supports_fn) (k))
-
-ddsi_tran_conn_t ddsi_factory_create_conn
-(
-  ddsi_tran_factory_t factory,
-  uint32_t port,
-  ddsi_tran_qos_t qos
-);
 void ddsi_tran_factories_fini (void);
 void ddsi_factory_add (ddsi_tran_factory_t factory);
 void ddsi_factory_free (ddsi_tran_factory_t factory);
@@ -206,24 +185,56 @@ ddsi_tran_factory_t ddsi_factory_find (const char * type);
 ddsi_tran_factory_t ddsi_factory_find_supported_kind (int32_t kind);
 void ddsi_factory_conn_init (ddsi_tran_factory_t factory, ddsi_tran_conn_t conn);
 
-#define ddsi_conn_handle(c) (ddsi_tran_handle (&(c)->m_base))
-#define ddsi_conn_locator(c,l) (ddsi_tran_locator (&(c)->m_base,(l)))
-OSAPI_EXPORT ssize_t ddsi_conn_write (ddsi_tran_conn_t conn, const nn_locator_t *dst, size_t niov, const os_iovec_t *iov, uint32_t flags);
-ssize_t ddsi_conn_read (ddsi_tran_conn_t conn, unsigned char * buf, size_t len, nn_locator_t *srcloc);
+inline bool ddsi_factory_supports (ddsi_tran_factory_t factory, int32_t kind) {
+  return factory->m_supports_fn (kind);
+}
+inline ddsi_tran_conn_t ddsi_factory_create_conn (ddsi_tran_factory_t factory, uint32_t port, ddsi_tran_qos_t qos) {
+  return factory->m_create_conn_fn (port, qos);
+}
+inline ddsi_tran_listener_t ddsi_factory_create_listener (ddsi_tran_factory_t factory, int port, ddsi_tran_qos_t qos) {
+  return factory->m_create_listener_fn (port, qos);
+}
+
+void ddsi_tran_free (ddsi_tran_base_t base);
+void ddsi_tran_free_qos (ddsi_tran_qos_t qos);
+ddsi_tran_qos_t ddsi_tran_create_qos (void);
+inline os_socket ddsi_tran_handle (ddsi_tran_base_t base) {
+  return base->m_handle_fn (base);
+}
+inline int ddsi_tran_locator (ddsi_tran_base_t base, nn_locator_t * loc) {
+  return base->m_locator_fn (base, loc);
+}
+
+inline os_socket ddsi_conn_handle (ddsi_tran_conn_t conn) {
+  return conn->m_base.m_handle_fn (&conn->m_base);
+}
+inline uint32_t ddsi_conn_type (ddsi_tran_conn_t conn) {
+  return conn->m_base.m_trantype;
+}
+inline uint32_t ddsi_conn_port (ddsi_tran_conn_t conn) {
+  return conn->m_base.m_port;
+}
+inline int ddsi_conn_locator (ddsi_tran_conn_t conn, nn_locator_t * loc) {
+  return conn->m_base.m_locator_fn (&conn->m_base, loc);
+}
+inline ssize_t ddsi_conn_write (ddsi_tran_conn_t conn, const nn_locator_t *dst, size_t niov, const os_iovec_t *iov, uint32_t flags) {
+  return conn->m_closed ? -1 : (conn->m_write_fn) (conn, dst, niov, iov, flags);
+}
+inline ssize_t ddsi_conn_read (ddsi_tran_conn_t conn, unsigned char * buf, size_t len, nn_locator_t *srcloc) {
+  return conn->m_closed ? -1 : conn->m_read_fn (conn, buf, len, srcloc);
+}
 bool ddsi_conn_peer_locator (ddsi_tran_conn_t conn, nn_locator_t * loc);
 void ddsi_conn_disable_multiplexing (ddsi_tran_conn_t conn);
 void ddsi_conn_add_ref (ddsi_tran_conn_t conn);
 void ddsi_conn_free (ddsi_tran_conn_t conn);
-
 int ddsi_conn_join_mc (ddsi_tran_conn_t conn, const nn_locator_t *srcip, const nn_locator_t *mcip, const struct nn_interface *interf);
 int ddsi_conn_leave_mc (ddsi_tran_conn_t conn, const nn_locator_t *srcip, const nn_locator_t *mcip, const struct nn_interface *interf);
-
 void ddsi_conn_transfer_group_membership (ddsi_tran_conn_t conn, ddsi_tran_conn_t newconn);
 int ddsi_conn_rejoin_transferred_mcgroups (ddsi_tran_conn_t conn);
-
 int ddsi_is_mcaddr (const nn_locator_t *loc);
 int ddsi_is_ssm_mcaddr (const nn_locator_t *loc);
 enum ddsi_nearby_address_result ddsi_is_nearby_address (const nn_locator_t *loc, size_t ninterf, const struct nn_interface interf[]);
+
 enum ddsi_locator_from_string_result ddsi_locator_from_string (nn_locator_t *loc, const char *str);
 
 /*  8 for transport/
@@ -242,9 +253,15 @@ char *ddsi_locator_to_string_no_port (char *dst, size_t sizeof_dst, const nn_loc
 
 int ddsi_enumerate_interfaces (ddsi_tran_factory_t factory, os_ifaddrs_t **interfs);
 
-#define ddsi_listener_locator(s,l) (ddsi_tran_locator (&(s)->m_base,(l)))
-ddsi_tran_conn_t ddsi_listener_accept (ddsi_tran_listener_t listener);
-int ddsi_listener_listen (ddsi_tran_listener_t listener);
+inline int ddsi_listener_locator (ddsi_tran_listener_t listener, nn_locator_t * loc) {
+  return listener->m_base.m_locator_fn (&listener->m_base, loc);
+}
+inline int ddsi_listener_listen (ddsi_tran_listener_t listener) {
+  return listener->m_listen_fn (listener);
+}
+inline ddsi_tran_conn_t ddsi_listener_accept (ddsi_tran_listener_t listener) {
+  return listener->m_accept_fn (listener);
+}
 void ddsi_listener_unblock (ddsi_tran_listener_t listener);
 void ddsi_listener_free (ddsi_tran_listener_t listener);
 

src/core/ddsi/include/ddsi/q_align.h

@@ -1,18 +0,0 @@
-/*
- * Copyright(c) 2006 to 2018 ADLINK Technology Limited and others
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License
- * v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- */
-#ifndef NN_ALIGN_H
-#define NN_ALIGN_H
-
-#define ALIGN4(x) (((x) + 3) & -4u)
-#define ALIGN8(x) (((x) + 7) & -8u)
-
-#endif /* NN_ALIGN_H */

src/core/ddsi/include/ddsi/q_bswap.h

@@ -17,13 +17,14 @@
 #include "ddsi/q_rtps.h" /* for nn_guid_t, nn_guid_prefix_t */
 #include "ddsi/q_protocol.h" /* for nn_sequence_number_t */
 
-#define bswap2(x) ((int16_t) bswap2u ((uint16_t) (x)))
-#define bswap4(x) ((int32_t) bswap4u ((uint32_t) (x)))
-#define bswap8(x) ((int64_t) bswap8u ((uint64_t) (x)))
-
 inline uint16_t bswap2u (uint16_t x)
 {
-  return (unsigned short) ((x >> 8) | (x << 8));
+  return (uint16_t) ((x >> 8) | (x << 8));
+}
+
+inline int16_t bswap2 (int16_t x)
+{
+  return (int16_t) bswap2u ((uint16_t) x);
 }
 
 inline uint32_t bswap4u (uint32_t x)
@@ -31,6 +32,11 @@ inline uint32_t bswap4u (uint32_t x)
   return (x >> 24) | ((x >> 8) & 0xff00) | ((x << 8) & 0xff0000) | (x << 24);
 }
 
+inline int32_t bswap4 (int32_t x)
+{
+  return (int32_t) bswap4u ((uint32_t) x);
+}
+
 inline uint64_t bswap8u (uint64_t x)
 {
   const uint32_t newhi = bswap4u ((uint32_t) x);
@@ -38,6 +44,11 @@ inline uint64_t bswap8u (uint64_t x)
   return ((uint64_t) newhi << 32) | (uint64_t) newlo;
 }
 
+inline int64_t bswap8 (int64_t x)
+{
+  return (int64_t) bswap8u ((uint64_t) x);
+}
+
 inline void bswapSN (nn_sequence_number_t *sn)
 {
   sn->high = bswap4 (sn->high);

src/core/ddsi/include/ddsi/q_entity.h

@@ -51,7 +51,7 @@ typedef struct status_cb_data
 }
 status_cb_data_t;
 
-typedef void (*status_cb_t) (void * entity, const status_cb_data_t * data);
+typedef void (*status_cb_t) (void *entity, const status_cb_data_t *data);
 
 struct prd_wr_match {
   ut_avlNode_t avlnode;

src/core/ddsi/src/ddsi_raweth.c

@@ -312,6 +312,22 @@ static int ddsi_raweth_is_mcaddr (const ddsi_tran_factory_t tran, const nn_locat
   return (loc->address[10] & 1);
 }
 
+static int ddsi_raweth_is_ssm_mcaddr (const ddsi_tran_factory_t tran, const nn_locator_t *loc)
+{
+  (void) tran;
+  (void) loc;
+  return 0;
+}
+
+static enum ddsi_nearby_address_result ddsi_raweth_is_nearby_address (ddsi_tran_factory_t tran, const nn_locator_t *loc, size_t ninterf, const struct nn_interface interf[])
+{
+  (void) tran;
+  (void) loc;
+  (void) ninterf;
+  (void) interf;
+  return DNAR_LOCAL;
+}
+
 static enum ddsi_locator_from_string_result ddsi_raweth_address_from_string (ddsi_tran_factory_t tran, nn_locator_t *loc, const char *str)
 {
   int i = 0;
@@ -371,7 +387,8 @@ int ddsi_raweth_init (void)
     ddsi_raweth_factory_g.m_join_mc_fn = ddsi_raweth_join_mc;
     ddsi_raweth_factory_g.m_leave_mc_fn = ddsi_raweth_leave_mc;
     ddsi_raweth_factory_g.m_is_mcaddr_fn = ddsi_raweth_is_mcaddr;
-    ddsi_raweth_factory_g.m_is_nearby_address_fn = ddsi_ipaddr_is_nearby_address;
+    ddsi_raweth_factory_g.m_is_ssm_mcaddr_fn = ddsi_raweth_is_ssm_mcaddr;
+    ddsi_raweth_factory_g.m_is_nearby_address_fn = ddsi_raweth_is_nearby_address;
     ddsi_raweth_factory_g.m_locator_from_string_fn = ddsi_raweth_address_from_string;
     ddsi_raweth_factory_g.m_locator_to_string_fn = ddsi_raweth_to_string;
     ddsi_raweth_factory_g.m_enumerate_interfaces_fn = ddsi_raweth_enumerate_interfaces;

src/core/ddsi/src/ddsi_tcp.c

@@ -1042,6 +1042,25 @@ static enum ddsi_locator_from_string_result ddsi_tcp_address_from_string (ddsi_t
   return ddsi_ipaddr_from_string(tran, loc, str, ddsi_tcp_factory_g.m_kind);
 }
 
+static int ddsi_tcp_is_mcaddr (const ddsi_tran_factory_t tran, const nn_locator_t *loc)
+{
+  (void) tran;
+  (void) loc;
+  return 0;
+}
+
+static int ddsi_tcp_is_ssm_mcaddr (const ddsi_tran_factory_t tran, const nn_locator_t *loc)
+{
+  (void) tran;
+  (void) loc;
+  return 0;
+}
+
+static enum ddsi_nearby_address_result ddsi_tcp_is_nearby_address (ddsi_tran_factory_t tran, const nn_locator_t *loc, size_t ninterf, const struct nn_interface interf[])
+{
+  return ddsi_ipaddr_is_nearby_address(tran, loc, ninterf, interf);
+}
+
 int ddsi_tcp_init (void)
 {
   static bool init = false;
@@ -1063,6 +1082,9 @@ int ddsi_tcp_init (void)
     ddsi_tcp_factory_g.m_locator_from_string_fn = ddsi_tcp_address_from_string;
     ddsi_tcp_factory_g.m_locator_to_string_fn = ddsi_ipaddr_to_string;
     ddsi_tcp_factory_g.m_enumerate_interfaces_fn = ddsi_eth_enumerate_interfaces;
+    ddsi_tcp_factory_g.m_is_mcaddr_fn = ddsi_tcp_is_mcaddr;
+    ddsi_tcp_factory_g.m_is_ssm_mcaddr_fn = ddsi_tcp_is_ssm_mcaddr;
+    ddsi_tcp_factory_g.m_is_nearby_address_fn = ddsi_tcp_is_nearby_address;
     ddsi_factory_add (&ddsi_tcp_factory_g);
 
 #if OS_SOCKET_HAS_IPV6

src/core/ddsi/src/ddsi_tran.c

@@ -19,6 +19,21 @@
 
 static ddsi_tran_factory_t ddsi_tran_factories = NULL;
 
+extern inline uint32_t ddsi_conn_type (ddsi_tran_conn_t conn);
+extern inline uint32_t ddsi_conn_port (ddsi_tran_conn_t conn);
+extern inline ddsi_tran_listener_t ddsi_factory_create_listener (ddsi_tran_factory_t factory, int port, ddsi_tran_qos_t qos);
+extern inline bool ddsi_factory_supports (ddsi_tran_factory_t factory, int32_t kind);
+extern inline os_socket ddsi_conn_handle (ddsi_tran_conn_t conn);
+extern inline int ddsi_conn_locator (ddsi_tran_conn_t conn, nn_locator_t * loc);
+extern inline os_socket ddsi_tran_handle (ddsi_tran_base_t base);
+extern inline ddsi_tran_conn_t ddsi_factory_create_conn (ddsi_tran_factory_t factory, uint32_t port, ddsi_tran_qos_t qos);
+extern inline int ddsi_tran_locator (ddsi_tran_base_t base, nn_locator_t * loc);
+extern inline int ddsi_listener_locator (ddsi_tran_listener_t listener, nn_locator_t * loc);
+extern inline int ddsi_listener_listen (ddsi_tran_listener_t listener);
+extern inline ddsi_tran_conn_t ddsi_listener_accept (ddsi_tran_listener_t listener);
+extern inline ssize_t ddsi_conn_read (ddsi_tran_conn_t conn, unsigned char * buf, size_t len, nn_locator_t *srcloc);
+extern inline ssize_t ddsi_conn_write (ddsi_tran_conn_t conn, const nn_locator_t *dst, size_t niov, const os_iovec_t *iov, uint32_t flags);
+
 void ddsi_factory_add (ddsi_tran_factory_t factory)
 {
   factory->m_factory = ddsi_tran_factories;
@@ -144,32 +159,6 @@ void ddsi_factory_conn_init (ddsi_tran_factory_t factory, ddsi_tran_conn_t conn)
   conn->m_factory = factory;
 }
 
-ssize_t ddsi_conn_read (ddsi_tran_conn_t conn, unsigned char * buf, size_t len, nn_locator_t *srcloc)
-{
-  return (conn->m_closed) ? -1 : (conn->m_read_fn) (conn, buf, len, srcloc);
-}
-
-ssize_t ddsi_conn_write (ddsi_tran_conn_t conn, const nn_locator_t *dst, size_t niov, const os_iovec_t *iov, uint32_t flags)
-{
-  ssize_t ret = -1;
-  if (! conn->m_closed)
-  {
-    ret = (conn->m_write_fn) (conn, dst, niov, iov, flags);
-  }
-
-  /* Check that write function is atomic (all or nothing) */
-#ifndef NDEBUG
-  {
-    size_t i, len;
-    for (i = 0, len = 0; i < niov; i++) {
-      len += iov[i].iov_len;
-    }
-    assert (ret == -1 || (size_t) ret == len);
-  }
-#endif
-  return ret;
-}
-
 void ddsi_conn_disable_multiplexing (ddsi_tran_conn_t conn)
 {
   if (conn->m_disable_multiplexing_fn) {
@@ -202,11 +191,6 @@ int ddsi_conn_leave_mc (ddsi_tran_conn_t conn, const nn_locator_t *srcloc, const
   return conn->m_factory->m_leave_mc_fn (conn, srcloc, mcloc, interf);
 }
 
-os_socket ddsi_tran_handle (ddsi_tran_base_t base)
-{
-  return (base->m_handle_fn) (base);
-}
-
 ddsi_tran_qos_t ddsi_tran_create_qos (void)
 {
   ddsi_tran_qos_t qos;
@@ -215,31 +199,6 @@ ddsi_tran_qos_t ddsi_tran_create_qos (void)
   return qos;
 }
 
-ddsi_tran_conn_t ddsi_factory_create_conn
-(
-  ddsi_tran_factory_t factory,
-  uint32_t port,
-  ddsi_tran_qos_t qos
-)
-{
-  return factory->m_create_conn_fn (port, qos);
-}
-
-int ddsi_tran_locator (ddsi_tran_base_t base, nn_locator_t * loc)
-{
-  return (base->m_locator_fn) (base, loc);
-}
-
-int ddsi_listener_listen (ddsi_tran_listener_t listener)
-{
-  return (listener->m_listen_fn) (listener);
-}
-
-ddsi_tran_conn_t ddsi_listener_accept (ddsi_tran_listener_t listener)
-{
-  return (listener->m_accept_fn) (listener);
-}
-
 void ddsi_tran_free (ddsi_tran_base_t base)
 {
   if (base)
@@ -274,21 +233,20 @@ void ddsi_listener_free (ddsi_tran_listener_t listener)
 
 int ddsi_is_mcaddr (const nn_locator_t *loc)
 {
-  /* FIXME: should set m_is_mcaddr_fn to a function returning false if transport doesn't provide an implementation, and get rid of the test */
-  ddsi_tran_factory_t tran = ddsi_factory_find_supported_kind(loc->kind);
-  return tran && tran->m_is_mcaddr_fn ? tran->m_is_mcaddr_fn (tran, loc) : 0;
+  ddsi_tran_factory_t tran = ddsi_factory_find_supported_kind (loc->kind);
+  return tran ? tran->m_is_mcaddr_fn (tran, loc) : 0;
 }
 
 int ddsi_is_ssm_mcaddr (const nn_locator_t *loc)
 {
   ddsi_tran_factory_t tran = ddsi_factory_find_supported_kind(loc->kind);
-  return tran && tran->m_is_ssm_mcaddr_fn ? tran->m_is_ssm_mcaddr_fn (tran, loc) : 0;
+  return tran ? tran->m_is_ssm_mcaddr_fn (tran, loc) : 0;
 }
 
 enum ddsi_nearby_address_result ddsi_is_nearby_address (const nn_locator_t *loc, size_t ninterf, const struct nn_interface interf[])
 {
   ddsi_tran_factory_t tran = ddsi_factory_find_supported_kind(loc->kind);
-  return tran->m_is_nearby_address_fn ? tran->m_is_nearby_address_fn (tran, loc, ninterf, interf) : DNAR_DISTANT;
+  return tran ? tran->m_is_nearby_address_fn (tran, loc, ninterf, interf) : DNAR_DISTANT;
 }
 
 enum ddsi_locator_from_string_result ddsi_locator_from_string (nn_locator_t *loc, const char *str)

src/core/ddsi/src/q_bswap_inlines.c

@@ -14,5 +14,8 @@
 extern inline uint16_t bswap2u (uint16_t x);
 extern inline uint32_t bswap4u (uint32_t x);
 extern inline uint64_t bswap8u (uint64_t x);
+extern inline int16_t bswap2 (int16_t x);
+extern inline int32_t bswap4 (int32_t x);
+extern inline int64_t bswap8 (int64_t x);
 extern inline void bswapSN (nn_sequence_number_t *sn);
 

src/core/ddsi/src/q_init.c

@@ -29,7 +29,6 @@
 #include "ddsi/q_lat_estim.h"
 #include "ddsi/q_bitset.h"
 #include "ddsi/q_xevent.h"
-#include "ddsi/q_align.h"
 #include "ddsi/q_addrset.h"
 #include "ddsi/q_ddsi_discovery.h"
 #include "ddsi/q_radmin.h"
@@ -680,7 +679,7 @@ int create_multicast_sockets(void)
   gv.disc_conn_mc = disc;
   gv.data_conn_mc = data;
   DDS_TRACE("Multicast Ports: discovery %d data %d \n",
-          ddsi_tran_port (gv.disc_conn_mc), ddsi_tran_port (gv.data_conn_mc));
+          ddsi_conn_port (gv.disc_conn_mc), ddsi_conn_port (gv.data_conn_mc));
   return 1;
 
 err_data:
@@ -1113,7 +1112,7 @@ int rtps_init (void)
   if (gv.m_factory->m_connless)
   {
     if (!(config.many_sockets_mode == MSM_NO_UNICAST && config.allowMulticast))
-      DDS_TRACE("Unicast Ports: discovery %d data %d\n", ddsi_tran_port (gv.disc_conn_uc), ddsi_tran_port (gv.data_conn_uc));
+      DDS_TRACE("Unicast Ports: discovery %d data %d\n", ddsi_conn_port (gv.disc_conn_uc), ddsi_conn_port (gv.data_conn_uc));
 
     if (config.allowMulticast)
     {
@@ -1128,11 +1127,11 @@ int rtps_init (void)
 
       /* Set multicast locators */
       if (!is_unspec_locator(&gv.loc_spdp_mc))
-        gv.loc_spdp_mc.port = ddsi_tran_port (gv.disc_conn_mc);
+        gv.loc_spdp_mc.port = ddsi_conn_port (gv.disc_conn_mc);
       if (!is_unspec_locator(&gv.loc_meta_mc))
-        gv.loc_meta_mc.port = ddsi_tran_port (gv.disc_conn_mc);
+        gv.loc_meta_mc.port = ddsi_conn_port (gv.disc_conn_mc);
       if (!is_unspec_locator(&gv.loc_default_mc))
-        gv.loc_default_mc.port = ddsi_tran_port (gv.data_conn_mc);
+        gv.loc_default_mc.port = ddsi_conn_port (gv.data_conn_mc);
 
       if (joinleave_spdp_defmcip (1) < 0)
         goto err_mc_conn;
@@ -1167,7 +1166,7 @@ int rtps_init (void)
   /* Create shared transmit connection */
 
   gv.tev_conn = gv.data_conn_uc;
-  DDS_TRACE("Timed event transmit port: %d\n", (int) ddsi_tran_port (gv.tev_conn));
+  DDS_TRACE("Timed event transmit port: %d\n", (int) ddsi_conn_port (gv.tev_conn));
 
 #ifdef DDSI_INCLUDE_NETWORK_CHANNELS
   {

src/core/ddsi/src/q_plist.c

@@ -21,7 +21,6 @@
 
 #include "ddsi/q_bswap.h"
 #include "ddsi/q_unused.h"
-#include "ddsi/q_align.h"
 #include "ddsi/q_error.h"
 #include "ddsi/q_plist.h"
 #include "ddsi/q_time.h"

src/core/ddsi/src/q_radmin.c

@@ -32,7 +32,6 @@
 #include "ddsi/q_config.h"
 #include "ddsi/q_log.h"
 
-#include "ddsi/q_align.h"
 #include "ddsi/q_plist.h"
 #include "ddsi/q_unused.h"
 #include "ddsi/q_radmin.h"

src/core/ddsi/src/q_receive.c

@@ -30,7 +30,6 @@
 #include "ddsi/q_lat_estim.h"
 #include "ddsi/q_bitset.h"
 #include "ddsi/q_xevent.h"
-#include "ddsi/q_align.h"
 #include "ddsi/q_addrset.h"
 #include "ddsi/q_ddsi_discovery.h"
 #include "ddsi/q_radmin.h"

src/core/ddsi/src/q_xmsg.c

@@ -34,7 +34,6 @@
 #include "ddsi/q_log.h"
 #include "ddsi/q_unused.h"
 #include "ddsi/q_xmsg.h"
-#include "ddsi/q_align.h"
 #include "ddsi/q_config.h"
 #include "ddsi/q_entity.h"
 #include "ddsi/q_globals.h"
@@ -1339,7 +1338,18 @@ static ssize_t nn_xpack_send1 (const nn_locator_t *loc, void * varg)
 #endif
   {
     if (!gv.mute)
+    {
       nbytes = ddsi_conn_write (xp->conn, loc, xp->niov, xp->iov, xp->call_flags);
+#ifndef NDEBUG
+      {
+        size_t i, len;
+        for (i = 0, len = 0; i < xp->niov; i++) {
+          len += xp->iov[i].iov_len;
+        }
+        assert (nbytes == -1 || (size_t) nbytes == len);
+      }
+#endif
+    }
     else
     {
       DDS_TRACE("(dropped)");