unit/test-sdp: Avoid extra copies when sending a PDU
Luiz Augusto von Dentz
maintainerPATCH 1/2 unit/test-sdp: Avoid extra copies when sending a PDU
From: Luiz Augusto von Dentz <[email protected]>
Make use of writev instead of creating a separate buffer to transmit the data.
--- unit/test-sdp.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-)
unit/test-sdp.c +10 -17
@@ -29,6 +29,7 @@#include <stdlib.h> #include <stdbool.h> #include <sys/socket.h> +#include <sys/uio.h> #include <glib.h>
@@ -191,31 +192,23 @@ static gboolean send_pdu(gpointer user_data) {struct context *context = user_data;const struct sdp_pdu *req_pdu; -uint16_t pdu_len; -unsigned char *buf; +struct iovec iov[2 ];ssize_t len; req_pdu = &context->data->pdu_list[context->pdu_offset]; - pdu_len = req_pdu->raw_size + context->cont_size; + iov[0 ].iov_base = (void *) req_pdu->raw_data; + iov[0 ].iov_len = req_pdu->raw_size; - buf =g_malloc0 (pdu_len); + iov[1 ].iov_base = context->cont_data; + iov[1 ].iov_len = context->cont_size; -memcpy (buf, req_pdu->raw_data, req_pdu->raw_size); +if (context->cont_size && context->cont_size != req_pdu->cont_len) +put_be16 (req_pdu->cont_len, iov[1 ].iov_base +4 ); -if (context->cont_size >0 ) { -memcpy (buf + req_pdu->raw_size, context->cont_data, - context->cont_size); -if (context->cont_size != req_pdu->cont_len) -put_be16 (req_pdu->cont_len, - buf + req_pdu->raw_size +4 ); - } - - len =write (context->fd, buf, pdu_len); - -g_free (buf); + len =writev (context->fd, iov,2 ); -g_assert (len == pdu_len); +g_assert (len == (ssize_t ) (iov[0 ].iov_len + iov[1 ].iov_len));return FALSE; }
Signature · 1 line
2.17.2
Luiz Augusto von Dentz
maintainerPATCH 2/2 unit: Fix fsanitize-address-use-after-scope with GCC 9
From: Luiz Augusto von Dentz <[email protected]>
Raw data payload must be copied since the declaration goes out of scope:
--- unit/test-avctp.c | 2 +- unit/test-avdtp.c | 2 +- unit/test-avrcp.c | 2 +- unit/test-gatt.c | 2 +- unit/test-hfp.c | 2 +- unit/test-hog.c | 10 +++++----- unit/test-sdp.c | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-)
unit/test-avctp.c +1 -1
@@ -66,7 +66,7 @@ struct context { #define raw_pdu(args...) \ { \ .valid = true, \ - .data = data(args), \ + .data = g_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ }
unit/test-avdtp.c +1 -1
@@ -61,7 +61,7 @@ struct test_data { #define raw_pdu(args...) \ { \ .valid = true, \ - .data = data(args), \ + .data = g_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ }
unit/test-avrcp.c +1 -1
@@ -74,7 +74,7 @@ struct context { #define raw_pdu(args...) \ { \ .valid = true, \ - .data = data(args), \ + .data = g_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ }
unit/test-gatt.c +1 -1
@@ -86,7 +86,7 @@ struct context { #define raw_pdu(args...) \ { \ .valid = true, \ - .data = data(args), \ + .data = g_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ }
unit/test-hfp.c +1 -1
@@ -63,7 +63,7 @@ struct test_data { #define raw_pdu(args...) \ { \ .valid = true, \ - .data = data(args), \ + .data = g_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ }
unit/test-hog.c +5 -5
@@ -69,11 +69,11 @@ struct context { #define data(args...) ((const unsigned char[]) { args }) -#define raw_pdu(args...) \ -{ \ - .valid = true, \ - .data = data(args), \ - .size = sizeof(data(args)),\ +#define raw_pdu(args...) \ +{ \ + .valid = true, \ + .data = g_memdup(data(args), sizeof(data(args))), \ + .size = sizeof(data(args)), \ }#define false_pdu () \
unit/test-sdp.c +3 -3
@@ -60,14 +60,14 @@ struct test_data { #define raw_pdu(args...) \ { \ .valid = true, \ - .raw_data = raw_data(args), \ + .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ .raw_size = sizeof(raw_data(args)), \ } #define raw_pdu_cont(cont, args...) \ { \ .valid = true, \ - .raw_data = raw_data(args), \ + .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ .raw_size = sizeof(raw_data(args)), \ .cont_len = cont, \ }
@@ -105,7 +105,7 @@ struct test_data_de {#define define_test_de_attr (name, input, exp) \ do { \ static struct test_data_de data; \ - data.input_data = input; \ + data.input_data = g_memdup(input, sizeof(input)); \ data.input_size = sizeof(input); \ data.expected = exp; \ tester_add("/sdp/DE/ATTR/" name, &data, NULL, \
Signature · 1 line
2.17.2