michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Clean up bt_conn reference counting

Browse source 
Make the reference counting of bt_conn clearer by having the reference
taken by the first state transition and released by the last state
transition handled in the bt_conn_set_state() function.

Change-Id: Iee04758fcc7f770e6ccfd351f33be60e7d646f19
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2015-07-08 10:55:51 +03:00 • committed by Anas Nashif
commit 5ed9cb7b5b
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
net/bluetooth/conn.c
View file

@ -307,20 +307,18 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state)
old_state = conn->state;
conn->state = state;
/* Take a reference for the first state transition after
* bt_conn_add() and keep it until reaching DISCONNECTED again.
*/
if (old_state == BT_CONN_DISCONNECTED) {
bt_conn_get(conn);
}
switch (conn->state){
case BT_CONN_CONNECTED:
nano_fifo_init(&conn->tx_queue);
fiber_start(conn->tx_stack, sizeof(conn->tx_stack),
conn_tx_fiber, (int)bt_conn_get(conn), 0, 7, 0);
/* Connection creation process, as initiator, has already owned
* the reference. Drop such reference before transforms
* the ownership to CONNECTED state.
*/
if (old_state == BT_CONN_CONNECT) {
bt_conn_put(conn);
}
break;
case BT_CONN_DISCONNECTED:
/* Send dummy buffer to wake up and stop the tx fiber
@ -331,6 +329,9 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state)
nano_fifo_put(&conn->tx_queue, bt_buf_get(BT_DUMMY, 0));
}
/* Release the reference we took for the very first
* state transition.
*/
bt_conn_put(conn);
break;

3
net/bluetooth/hci_core.c
View file

@ -757,6 +757,7 @@ static void le_conn_complete(struct bt_buf *buf)
}
bt_connected(conn);
bt_conn_put(conn);
trigger_scan();
}
@ -1565,7 +1566,7 @@ struct bt_conn *bt_connect_le(const bt_addr_le_t *peer)
trigger_scan();
}
return bt_conn_get(conn);
return conn;
}
static int bt_hci_connect_le_cancel(struct bt_conn *conn)