monitor: Add latency information per channel

This attempts to print latency information per channel in addition to
per connection/handle:

> HCI Event: Number of Completed Packets (0x13) plen 5
        Num handles: 1
        Handle: 256 Address: XX:XX:XX:XX:XX:XX
        Count: 1
        Latency: 15 msec (3-39 msec ~18 msec)
        Channel: 68 [PSM 25 mode Basic (0x00)] {chan 2}
        Channel Latency: 15 msec (6-35 msec ~18 msec)

diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index 8aefaa9..297a53c 100755 (executable)
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -22,6 +22,7 @@
 #include "lib/uuid.h"
 
 #include "src/shared/util.h"
+#include "src/shared/queue.h"
 #include "bt.h"
 #include "packet.h"
 #include "display.h"
@@ -98,6 +99,9 @@ struct chan_data {
        uint8_t  ext_ctrl;
        uint8_t  seq_num;
        uint16_t sdu;
+       struct timeval tx_min;
+       struct timeval tx_max;
+       struct timeval tx_med;
 };
 
 static struct chan_data chan_list[MAX_CHAN];
@@ -1537,6 +1541,23 @@ static const struct sig_opcode_data le_sig_opcode_table[] = {
        { },
 };
 
+static void l2cap_queue_frame(struct l2cap_frame *frame)
+{
+       struct packet_conn_data *conn;
+       struct l2cap_frame *tx;
+
+       conn = packet_get_conn_data(frame->handle);
+       if (!conn)
+               return;
+
+       if (!conn->chan_q)
+               conn->chan_q = queue_new();
+
+       tx = new0(struct l2cap_frame, 1);
+       memcpy(tx, frame, sizeof(*frame));
+       queue_push_tail(conn->chan_q, tx);
+}
+
 void l2cap_frame_init(struct l2cap_frame *frame, uint16_t index, bool in,
                                uint16_t handle, uint8_t ident,
                                uint16_t cid, uint16_t psm,
@@ -1553,6 +1574,9 @@ void l2cap_frame_init(struct l2cap_frame *frame, uint16_t index, bool in,
        frame->psm     = psm ? psm : get_psm(frame);
        frame->mode    = get_mode(frame);
        frame->seq_num = psm ? 1 : get_seq_num(frame);
+
+       if (!in)
+               l2cap_queue_frame(frame);
 }
 
 static void bredr_sig_packet(uint16_t index, bool in, uint16_t handle,
@@ -2772,3 +2796,55 @@ void l2cap_packet(uint16_t index, bool in, uint16_t handle, uint8_t flags,
                return;
        }
 }
+
+#define TV_MSEC(_tv) (long long)((_tv)->tv_sec * 1000 + (_tv)->tv_usec / 1000)
+
+void l2cap_dequeue_frame(struct timeval *delta, struct packet_conn_data *conn)
+{
+       struct l2cap_frame *frame;
+       struct chan_data *chan;
+
+       frame = queue_pop_head(conn->chan_q);
+       if (!frame)
+               return;
+
+       chan = get_chan(frame);
+       if (!chan)
+               return;
+
+       if ((!timerisset(&chan->tx_min) || timercmp(delta, &chan->tx_min, <))
+                               && delta->tv_sec >= 0 && delta->tv_usec >= 0)
+               chan->tx_min = *delta;
+
+       if (!timerisset(&chan->tx_max) || timercmp(delta, &chan->tx_max, >))
+               chan->tx_max = *delta;
+
+       if (timerisset(&chan->tx_med)) {
+               struct timeval tmp;
+
+               timeradd(&chan->tx_med, delta, &tmp);
+
+               tmp.tv_sec /= 2;
+               tmp.tv_usec /= 2;
+               if (tmp.tv_sec % 2) {
+                       tmp.tv_usec += 500000;
+                       if (tmp.tv_usec >= 1000000) {
+                               tmp.tv_sec++;
+                               tmp.tv_usec -= 1000000;
+                       }
+               }
+
+               chan->tx_med = tmp;
+       } else
+               chan->tx_med = *delta;
+
+       print_field("Channel: %d [PSM %d mode %s (0x%02x)] {chan %d}",
+                       frame->cid, frame->psm, mode2str(frame->mode),
+                       frame->mode, frame->chan);
+
+       print_field("Channel Latency: %lld msec (%lld-%lld msec ~%lld msec)",
+                       TV_MSEC(delta), TV_MSEC(&chan->tx_min),
+                       TV_MSEC(&chan->tx_max), TV_MSEC(&chan->tx_med));
+
+       free(frame);
+}

diff --git a/monitor/l2cap.h b/monitor/l2cap.h
index 935066e..b545bf6 100755 (executable)
--- a/monitor/l2cap.h
+++ b/monitor/l2cap.h
@@ -355,3 +355,5 @@ void l2cap_packet(uint16_t index, bool in, uint16_t handle, uint8_t flags,
                                        const void *data, uint16_t size);
 
 void rfcomm_packet(const struct l2cap_frame *frame);
+
+void l2cap_dequeue_frame(struct timeval *delta, struct packet_conn_data *conn);

diff --git a/monitor/packet.c b/monitor/packet.c
index a4daf98..acf84e1 100755 (executable)
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -39,13 +39,13 @@
 #include "ll.h"
 #include "hwdb.h"
 #include "keys.h"
+#include "packet.h"
 #include "l2cap.h"
 #include "control.h"
 #include "vendor.h"
 #include "msft.h"
 #include "intel.h"
 #include "broadcom.h"
-#include "packet.h"
 
 #define COLOR_CHANNEL_LABEL            COLOR_WHITE
 #define COLOR_FRAME_LABEL              COLOR_WHITE
@@ -209,6 +209,7 @@ static void release_handle(uint16_t handle)
                                conn->destroy(conn->data);
 
                        queue_destroy(conn->tx_q, free);
+                       queue_destroy(conn->chan_q, free);
                        memset(conn, 0, sizeof(*conn));
                        break;
                }
@@ -10359,6 +10360,10 @@ static void packet_dequeue_tx(struct timeval *tv, uint16_t handle)
        print_field("Latency: %lld msec (%lld-%lld msec ~%lld msec)",
                        TV_MSEC(delta), TV_MSEC(conn->tx_min),
                        TV_MSEC(conn->tx_max), TV_MSEC(conn->tx_med));
+
+       l2cap_dequeue_frame(&delta, conn);
+
+       free(tx);
 }
 
 static void num_completed_packets_evt(struct timeval *tv, uint16_t index,

diff --git a/monitor/packet.h b/monitor/packet.h
index 0a6e00a..68123cc 100755 (executable)
--- a/monitor/packet.h
+++ b/monitor/packet.h
@@ -32,6 +32,7 @@ struct packet_conn_data {
        uint8_t  dst[6];
        uint8_t  dst_type;
        struct queue *tx_q;
+       struct queue *chan_q;
        struct timeval tx_min;
        struct timeval tx_max;
        struct timeval tx_med;