You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2017/03/07 00:05:16 UTC
[21/50] incubator-mynewt-core git commit: bletiny: Refactor buffer
handling in the application
bletiny: Refactor buffer handling in the application
With this patch we prepare os_mbuf_pool which is used later by application
to get sdu buffer
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/9bc81b10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/9bc81b10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/9bc81b10
Branch: refs/heads/1_0_0_dev
Commit: 9bc81b106fb11a14bf7eb973f1e10adbc0cd697a
Parents: 143f6f5
Author: \u0141ukasz Rymanowski <lu...@codecoup.pl>
Authored: Wed Feb 22 17:06:53 2017 +0100
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Mon Mar 6 15:50:28 2017 -0800
----------------------------------------------------------------------
apps/bletiny/src/main.c | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/9bc81b10/apps/bletiny/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c
index c468666..52cf7e6 100755
--- a/apps/bletiny/src/main.c
+++ b/apps/bletiny/src/main.c
@@ -73,6 +73,8 @@
#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM)
#define BLETINY_COC_MTU (256)
+/* We use same pool for incoming and outgoing sdu */
+#define BLETINY_COC_BUF_COUNT (3 * MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM))
#endif
struct log bletiny_log;
@@ -94,7 +96,8 @@ static void *bletiny_coc_conn_mem;
static struct os_mempool bletiny_coc_conn_pool;
static void *bletiny_sdu_coc_mem;
-static struct os_mempool bletiny_sdu_coc_pool;
+struct os_mbuf_pool sdu_os_mbuf_pool;
+static struct os_mempool sdu_coc_mbuf_mempool;
#endif
static struct os_callout bletiny_tx_timer;
@@ -1624,7 +1627,14 @@ bletiny_l2cap_coc_remove(uint16_t conn_handle, struct ble_l2cap_chan *chan)
static void
bletiny_l2cap_coc_recv(struct ble_l2cap_chan *chan, struct os_mbuf *sdu)
{
- console_printf("LE CoC SDU received, chan: 0x%08lx\n", (uint32_t) chan);
+ console_printf("LE CoC SDU received, chan: 0x%08lx, data len %d\n",
+ (uint32_t) chan, OS_MBUF_PKTLEN(sdu));
+
+ os_mbuf_free_chain(sdu);
+ sdu = os_mbuf_get_pkthdr(&sdu_os_mbuf_pool, 0);
+ assert(sdu != NULL);
+
+ ble_l2cap_recv_ready(chan, sdu);
}
static int
@@ -1633,9 +1643,9 @@ bletiny_l2cap_coc_accept(uint16_t conn_handle, uint16_t peer_mtu,
{
struct os_mbuf *sdu_rx;
- sdu_rx = os_memblock_get(&bletiny_sdu_coc_pool);
+ sdu_rx = os_mbuf_get_pkthdr(&sdu_os_mbuf_pool, 0);
if (!sdu_rx) {
- return BLE_HS_ENOMEM;
+ return BLE_HS_ENOMEM;
}
ble_l2cap_recv_ready(chan, sdu_rx);
@@ -1707,7 +1717,7 @@ bletiny_l2cap_connect(uint16_t conn_handle, uint16_t psm)
struct os_mbuf *sdu_rx;
- sdu_rx = os_memblock_get(&bletiny_sdu_coc_pool);
+ sdu_rx = os_mbuf_get_pkthdr(&sdu_os_mbuf_pool, 0);
assert(sdu_rx != NULL);
return ble_l2cap_connect(conn_handle, psm, BLETINY_COC_MTU, sdu_rx,
@@ -1793,16 +1803,18 @@ main(void)
#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) != 0
/* For testing we want to support all the available channels */
bletiny_sdu_coc_mem = malloc(
- OS_MEMPOOL_BYTES(BLETINY_COC_MTU * MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM),
- sizeof (struct os_mbuf)));
+ OS_MEMPOOL_BYTES(BLETINY_COC_BUF_COUNT, BLETINY_COC_MTU));
assert(bletiny_sdu_coc_mem != NULL);
- rc = os_mempool_init(&bletiny_sdu_coc_pool,
- BLETINY_COC_MTU * MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM),
- sizeof (struct os_mbuf), bletiny_sdu_coc_mem,
+ rc = os_mempool_init(&sdu_coc_mbuf_mempool, BLETINY_COC_BUF_COUNT,
+ BLETINY_COC_MTU, bletiny_sdu_coc_mem,
"bletiny_coc_sdu_pool");
assert(rc == 0);
+ rc = os_mbuf_pool_init(&sdu_os_mbuf_pool, &sdu_coc_mbuf_mempool,
+ BLETINY_COC_MTU, BLETINY_COC_BUF_COUNT);
+ assert(rc == 0);
+
bletiny_coc_conn_mem = malloc(
OS_MEMPOOL_BYTES(MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM),
sizeof (struct bletiny_l2cap_coc)));