Stream socket TX timestamp ids shall refer to the byte positions.
Add test:
L2CAP BR/EDR Client - Stream TX Timestamping
---
tools/iso-tester.c | 4 ++--
tools/l2cap-tester.c | 32 ++++++++++++++++++++++++++++----
tools/sco-tester.c | 4 ++--
tools/tester.h | 12 +++++++++---
4 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/tools/iso-tester.c b/tools/iso-tester.c
index b5e638808..ad0738091 100644
--- a/tools/iso-tester.c
+++ b/tools/iso-tester.c
@@ -2285,10 +2285,10 @@ static void iso_tx_timestamping(struct test_data *data, GIOChannel *io)
tester_print("Enabling TX timestamping");
- tx_tstamp_init(&data->tx_ts, isodata->so_timestamping);
+ tx_tstamp_init(&data->tx_ts, isodata->so_timestamping, false);
for (count = 0; count < isodata->repeat_send + 1; ++count)
- data->step += tx_tstamp_expect(&data->tx_ts);
+ data->step += tx_tstamp_expect(&data->tx_ts, 0);
sk = g_io_channel_unix_get_fd(io);
diff --git a/tools/l2cap-tester.c b/tools/l2cap-tester.c
index 7f3be6c0f..395e76dbc 100644
--- a/tools/l2cap-tester.c
+++ b/tools/l2cap-tester.c
@@ -102,6 +102,9 @@ struct l2cap_data {
/* Number of additional packets to send. */
unsigned int repeat_send;
+
+ /* Socket type (0 means SOCK_SEQPACKET) */
+ int sock_type;
};
static void print_debug(const char *str, void *user_data)
@@ -386,6 +389,19 @@ static const struct l2cap_data client_connect_tx_timestamping_test = {
.repeat_send = 2,
};
+static const struct l2cap_data client_connect_stream_tx_timestamping_test = {
+ .client_psm = 0x1001,
+ .server_psm = 0x1001,
+ .write_data = l2_data,
+ .data_len = sizeof(l2_data),
+ .so_timestamping = (SOF_TIMESTAMPING_SOFTWARE |
+ SOF_TIMESTAMPING_OPT_ID |
+ SOF_TIMESTAMPING_TX_SOFTWARE |
+ SOF_TIMESTAMPING_TX_COMPLETION),
+ .repeat_send = 2,
+ .sock_type = SOCK_STREAM,
+};
+
static const struct l2cap_data client_connect_shut_wr_success_test = {
.client_psm = 0x1001,
.server_psm = 0x1001,
@@ -1371,10 +1387,11 @@ static void l2cap_tx_timestamping(struct test_data *data, GIOChannel *io)
tester_print("Enabling TX timestamping");
- tx_tstamp_init(&data->tx_ts, l2data->so_timestamping);
+ tx_tstamp_init(&data->tx_ts, l2data->so_timestamping,
+ l2data->sock_type == SOCK_STREAM);
for (count = 0; count < l2data->repeat_send + 1; ++count)
- data->step += tx_tstamp_expect(&data->tx_ts);
+ data->step += tx_tstamp_expect(&data->tx_ts, l2data->data_len);
err = setsockopt(sk, SOL_SOCKET, SO_TIMESTAMPING, &so, sizeof(so));
if (err < 0) {
@@ -1523,9 +1540,12 @@ static int create_l2cap_sock(struct test_data *data, uint16_t psm,
const uint8_t *central_bdaddr;
struct sockaddr_l2 addr;
int sk, err;
+ int sock_type = SOCK_SEQPACKET;
- sk = socket(PF_BLUETOOTH, SOCK_SEQPACKET | SOCK_NONBLOCK,
- BTPROTO_L2CAP);
+ if (l2data && l2data->sock_type)
+ sock_type = l2data->sock_type;
+
+ sk = socket(PF_BLUETOOTH, sock_type | SOCK_NONBLOCK, BTPROTO_L2CAP);
if (sk < 0) {
err = -errno;
tester_warn("Can't create socket: %s (%d)", strerror(errno),
@@ -2523,6 +2543,10 @@ int main(int argc, char *argv[])
&client_connect_tx_timestamping_test,
setup_powered_client, test_connect);
+ test_l2cap_bredr("L2CAP BR/EDR Client - Stream TX Timestamping",
+ &client_connect_stream_tx_timestamping_test,
+ setup_powered_client, test_connect);
+
test_l2cap_bredr("L2CAP BR/EDR Client - Invalid PSM 1",
&client_connect_nval_psm_test_1,
setup_powered_client, test_connect);
diff --git a/tools/sco-tester.c b/tools/sco-tester.c
index 130ab526d..ae76b1ddd 100644
--- a/tools/sco-tester.c
+++ b/tools/sco-tester.c
@@ -689,10 +689,10 @@ static void sco_tx_timestamping(struct test_data *data, GIOChannel *io)
tester_print("Enabling TX timestamping");
- tx_tstamp_init(&data->tx_ts, scodata->so_timestamping);
+ tx_tstamp_init(&data->tx_ts, scodata->so_timestamping, false);
for (count = 0; count < scodata->repeat_send + 1; ++count)
- data->step += tx_tstamp_expect(&data->tx_ts);
+ data->step += tx_tstamp_expect(&data->tx_ts, 0);
err = setsockopt(sk, SOL_SOCKET, SO_TIMESTAMPING, &so, sizeof(so));
if (err < 0) {
diff --git a/tools/tester.h b/tools/tester.h
index 82770014f..14aa1e3ab 100644
--- a/tools/tester.h
+++ b/tools/tester.h
@@ -38,22 +38,27 @@ struct tx_tstamp_data {
unsigned int count;
unsigned int sent;
uint32_t so_timestamping;
+ bool stream;
};
static inline void tx_tstamp_init(struct tx_tstamp_data *data,
- uint32_t so_timestamping)
+ uint32_t so_timestamping, bool stream)
{
memset(data, 0, sizeof(*data));
memset(data->expect, 0xff, sizeof(data->expect));
data->so_timestamping = so_timestamping;
+ data->stream = stream;
}
-static inline int tx_tstamp_expect(struct tx_tstamp_data *data)
+static inline int tx_tstamp_expect(struct tx_tstamp_data *data, size_t len)
{
unsigned int pos = data->count;
int steps;
+ if (data->stream && len)
+ data->sent += len - 1;
+
if (data->so_timestamping & SOF_TIMESTAMPING_TX_SCHED) {
g_assert(pos < ARRAY_SIZE(data->expect));
data->expect[pos].type = SCM_TSTAMP_SCHED;
@@ -75,7 +80,8 @@ static inline int tx_tstamp_expect(struct tx_tstamp_data *data)
pos++;
}
- data->sent++;
+ if (!data->stream || len)
+ data->sent++;
steps = pos - data->count;
data->count = pos;
--
2.48.1
