You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2017/04/25 02:13:15 UTC
[1/3] incubator-mynewt-core git commit: nimble/transport;
MYNEWT-737: Make ble_hci_uart_tx_char more efficient
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/master 3596d33e1 -> 843e03dde
nimble/transport; MYNEWT-737: Make ble_hci_uart_tx_char more efficient
Modified the code in ble_hci_uart_tx_char to be faster. This
added a bit more code (should not have increased ram usage) and
should in general be faster than the old method and should also
free the mbufs slightly faster (each one is freed as it is
used).
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/be6ce3cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/be6ce3cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/be6ce3cc
Branch: refs/heads/master
Commit: be6ce3cc261f0fedee0807ce85aae0b287d13dd2
Parents: 271ab1b
Author: William San Filippo <wi...@runtime.io>
Authored: Thu Apr 20 19:36:37 2017 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Thu Apr 20 19:36:37 2017 -0700
----------------------------------------------------------------------
net/nimble/transport/uart/src/ble_hci_uart.c | 65 +++++++++++++++++++----
1 file changed, 54 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/be6ce3cc/net/nimble/transport/uart/src/ble_hci_uart.c
----------------------------------------------------------------------
diff --git a/net/nimble/transport/uart/src/ble_hci_uart.c b/net/nimble/transport/uart/src/ble_hci_uart.c
index 9de4ad7..a4c1855 100755
--- a/net/nimble/transport/uart/src/ble_hci_uart.c
+++ b/net/nimble/transport/uart/src/ble_hci_uart.c
@@ -125,6 +125,16 @@ struct ble_hci_uart_pkt {
uint8_t type;
};
+/**
+ * Structure for transmitting ACL packets over UART
+ *
+ */
+struct ble_hci_uart_h4_acl_tx
+{
+ uint8_t *dptr;
+ struct os_mbuf *tx_acl;
+};
+
static struct {
/*** State of data received over UART. */
uint8_t rx_type; /* Pending packet type. 0 means nothing pending */
@@ -135,9 +145,10 @@ static struct {
/*** State of data transmitted over UART. */
uint8_t tx_type; /* Pending packet type. 0 means nothing pending */
+ uint16_t rem_tx_len; /* Used for acl tx only currently */
union {
struct ble_hci_uart_cmd tx_cmd;
- struct os_mbuf *tx_acl;
+ struct ble_hci_uart_h4_acl_tx tx_pkt;
};
STAILQ_HEAD(, ble_hci_uart_pkt) tx_pkts; /* Packet queue to send to UART */
} ble_hci_uart_state;
@@ -170,6 +181,12 @@ ble_hci_uart_acl_tx(struct os_mbuf *om)
struct ble_hci_uart_pkt *pkt;
os_sr_t sr;
+ /* If this packet is zero length, just free it */
+ if (OS_MBUF_PKTLEN(om) == 0) {
+ os_mbuf_free_chain(om);
+ return 0;
+ }
+
pkt = os_memblock_get(&ble_hci_uart_pkt_pool);
if (pkt == NULL) {
os_mbuf_free_chain(om);
@@ -220,6 +237,7 @@ static int
ble_hci_uart_tx_pkt_type(void)
{
struct ble_hci_uart_pkt *pkt;
+ struct os_mbuf *om;
os_sr_t sr;
int rc;
@@ -255,7 +273,12 @@ ble_hci_uart_tx_pkt_type(void)
case BLE_HCI_UART_H4_ACL:
ble_hci_uart_state.tx_type = BLE_HCI_UART_H4_ACL;
- ble_hci_uart_state.tx_acl = pkt->data;
+ om = (struct os_mbuf *)pkt->data;
+ /* NOTE: first mbuf must have non-zero length */
+ os_mbuf_trim_front(om);
+ ble_hci_uart_state.tx_pkt.tx_acl = om;
+ ble_hci_uart_state.tx_pkt.dptr = om->om_data;
+ ble_hci_uart_state.rem_tx_len = OS_MBUF_PKTLEN(om);
break;
default:
@@ -276,7 +299,8 @@ static int
ble_hci_uart_tx_char(void *arg)
{
uint8_t u8;
- int rc = -1;
+ int rc;
+ struct os_mbuf *om;
switch (ble_hci_uart_state.tx_type) {
case BLE_HCI_UART_H4_NONE: /* No pending packet, pick one from the queue */
@@ -297,17 +321,36 @@ ble_hci_uart_tx_char(void *arg)
/* Copy the first unsent byte from the tx buffer and remove it from the
* source.
*/
- os_mbuf_copydata(ble_hci_uart_state.tx_acl, 0, 1, &u8);
- os_mbuf_adj(ble_hci_uart_state.tx_acl, 1);
-
- /* Free the tx buffer if this is the last byte to send. */
- if (OS_MBUF_PKTLEN(ble_hci_uart_state.tx_acl) == 0) {
- os_mbuf_free_chain(ble_hci_uart_state.tx_acl);
+ u8 = ble_hci_uart_state.tx_pkt.dptr[0];
+ --ble_hci_uart_state.rem_tx_len;
+ if (ble_hci_uart_state.rem_tx_len == 0) {
+ os_mbuf_free_chain(ble_hci_uart_state.tx_pkt.tx_acl);
ble_hci_uart_state.tx_type = BLE_HCI_UART_H4_NONE;
+ } else {
+ om = ble_hci_uart_state.tx_pkt.tx_acl;
+ --om->om_len;
+ if (om->om_len == 0) {
+ /* Remove and free any zero mbufs */
+ while ((om != NULL) && (om->om_len == 0)) {
+ ble_hci_uart_state.tx_pkt.tx_acl = SLIST_NEXT(om, om_next);
+ os_mbuf_free(om);
+ om = ble_hci_uart_state.tx_pkt.tx_acl;
+ }
+ /* NOTE: om should never be NULL! What to do? */
+ if (om == NULL) {
+ ble_hci_uart_state.tx_type = BLE_HCI_UART_H4_NONE;
+ } else {
+ ble_hci_uart_state.tx_pkt.dptr = om->om_data;
+ }
+ } else {
+ ble_hci_uart_state.tx_pkt.dptr++;
+ }
}
-
rc = u8;
break;
+ default:
+ rc = -1;
+ break;
}
return rc;
@@ -931,7 +974,7 @@ ble_hci_trans_reset(void)
ble_hci_uart_free_pkt(ble_hci_uart_state.tx_type,
ble_hci_uart_state.tx_cmd.data,
- ble_hci_uart_state.tx_acl);
+ ble_hci_uart_state.tx_pkt.tx_acl);
ble_hci_uart_state.tx_type = BLE_HCI_UART_H4_NONE;
while ((pkt = STAILQ_FIRST(&ble_hci_uart_state.tx_pkts)) != NULL) {
[2/3] incubator-mynewt-core git commit: nimble/transport;
MYNEWT-737: Make ble_hci_uart_tx_char more efficient
Posted by cc...@apache.org.
nimble/transport; MYNEWT-737: Make ble_hci_uart_tx_char more efficient
Per pull request review, add assert() if om is NULL. Did not
modify the rest of the code in case assert() is compiled out
by NDEBUG being defined.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/5a869e3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/5a869e3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/5a869e3e
Branch: refs/heads/master
Commit: 5a869e3e2e791fd83e763a02fcecb4803de6ce37
Parents: be6ce3c
Author: William San Filippo <wi...@runtime.io>
Authored: Mon Apr 24 12:19:01 2017 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Mon Apr 24 12:19:01 2017 -0700
----------------------------------------------------------------------
net/nimble/transport/uart/src/ble_hci_uart.c | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5a869e3e/net/nimble/transport/uart/src/ble_hci_uart.c
----------------------------------------------------------------------
diff --git a/net/nimble/transport/uart/src/ble_hci_uart.c b/net/nimble/transport/uart/src/ble_hci_uart.c
index a4c1855..19b89ae 100755
--- a/net/nimble/transport/uart/src/ble_hci_uart.c
+++ b/net/nimble/transport/uart/src/ble_hci_uart.c
@@ -338,6 +338,7 @@ ble_hci_uart_tx_char(void *arg)
}
/* NOTE: om should never be NULL! What to do? */
if (om == NULL) {
+ assert(0);
ble_hci_uart_state.tx_type = BLE_HCI_UART_H4_NONE;
} else {
ble_hci_uart_state.tx_pkt.dptr = om->om_data;
[3/3] incubator-mynewt-core git commit: This closes #243.
Posted by cc...@apache.org.
This closes #243.
Merge remote-tracking branch 'wes3/ble_hci_uart2'
* wes3/ble_hci_uart2:
nimble/transport; MYNEWT-737: Make ble_hci_uart_tx_char more efficient
nimble/transport; MYNEWT-737: Make ble_hci_uart_tx_char more efficient
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/843e03dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/843e03dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/843e03dd
Branch: refs/heads/master
Commit: 843e03dde5aaf3119ad348a70ba195e5b9ef7e36
Parents: 3596d33 5a869e3
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Apr 24 19:10:48 2017 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Apr 24 19:10:48 2017 -0700
----------------------------------------------------------------------
net/nimble/transport/uart/src/ble_hci_uart.c | 66 +++++++++++++++++++----
1 file changed, 55 insertions(+), 11 deletions(-)
----------------------------------------------------------------------