michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Make unicast elem lookup O(1)

Browse source 
As element addresses are sequential, there's no need for iterating
through the elements to find the one matching a unicast address.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
This commit is contained in:
Trond Einar Snekvik 2019-08-28 15:24:41 +02:00 • committed by Johan Hedberg
commit 110332cad9
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
subsys/bluetooth/mesh/access.c
View file

@ -402,17 +402,21 @@ static struct bt_mesh_model *bt_mesh_elem_find_group(struct bt_mesh_elem *elem,
struct bt_mesh_elem *bt_mesh_elem_find(u16_t addr) struct bt_mesh_elem *bt_mesh_elem_find(u16_t addr)
{ {
int i; u16_t index;
for (i = 0; i < dev_comp->elem_count; i++) { if (BT_MESH_ADDR_IS_UNICAST(addr)) {
struct bt_mesh_elem *elem = &dev_comp->elem[i]; index = (addr - dev_comp->elem[0].addr);
if (index < dev_comp->elem_count) {
return &dev_comp->elem[index];
} else {
return NULL;
}
}
if (BT_MESH_ADDR_IS_GROUP(addr) || for (index = 0; index < dev_comp->elem_count; index++) {
BT_MESH_ADDR_IS_VIRTUAL(addr)) { struct bt_mesh_elem *elem = &dev_comp->elem[index];
if (bt_mesh_elem_find_group(elem, addr)) {
return elem; if (bt_mesh_elem_find_group(elem, addr)) {
}
} else if (elem->addr == addr) {
return elem; return elem;
} }
} }