michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Refactor Mesh Model Extensions

Browse source 
The existing extension tree does not support all the features that are
defined by the specification (e.g. multiple parents).

This patch approaches this problem by defining a circular single-linked
list of extension models. So for a given model, all models that are on
the same list as that model are in some extension relationship with that
model. All models on a list represent a single connected component of an
extension graph but without defining specific relationships between each
pair of models. This list is used to manage a shared subscription list
as per the Mesh Profile Specification:

```4.2.4 Subscription List

Within an element, each model has a separate instance of a Subscription
List, unless the model extends another model on that element. Instances
of models that extend other models (i.e., all models within an extension
relation tree) shall share a single instance of a Subscription List per
element.
```

Signed-off-by: Michał Narajowski <michal.narajowski@codecoup.pl>
This commit is contained in:
Michał Narajowski 2021-07-26 16:16:01 +02:00 • committed by Anas Nashif
commit e167ca6539
4 changed files with 80 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

29
include/bluetooth/mesh/access.h
View file

@ -509,11 +509,10 @@ struct bt_mesh_model {
const struct bt_mesh_model_cb * const cb;
#ifdef CONFIG_BT_MESH_MODEL_EXTENSIONS
/* Pointer to the next model in a model extension tree. */
/* Pointer to the next model in a model extension list. */
struct bt_mesh_model *next;
/* Pointer to the first model this model extends. */
struct bt_mesh_model *extends;
#endif
/** Model-specific user data */
void *user_data;
};
@ -634,25 +633,31 @@ int bt_mesh_model_data_store(struct bt_mesh_model *mod, bool vnd,
* Mesh models may be extended to reuse their functionality, forming a more
* complex model. A Mesh model may extend any number of models, in any element.
* The extensions may also be nested, ie a model that extends another may
* itself be extended. Extensions may not be cyclical, and a model can only be
* extended by one other model.
* itself be extended.
*
* A set of models that extend each other form a model extension tree.
* A set of models that extend each other form a model extension list.
*
* All models in an extension tree share one subscription list per element. The
* All models in an extension list share one subscription list per element. The
* access layer will utilize the combined subscription list of all models in an
* extension tree and element, giving the models extended subscription list
* extension list and element, giving the models extended subscription list
* capacity.
*
* @param mod Mesh model.
* @param base_mod The model being extended.
* @param extending_mod Mesh model that is extending the base model.
* @param base_mod The model being extended.
*
* @retval 0 Successfully extended the base_mod model.
* @retval -EALREADY The base_mod model is already extended.
*/
int bt_mesh_model_extend(struct bt_mesh_model *mod,
int bt_mesh_model_extend(struct bt_mesh_model *extending_mod,
struct bt_mesh_model *base_mod);
/** @brief Check if model is extended by another model.
*
* @param model The model to check.
*
* @retval true If model is extended by another model, otherwise false
*/
bool bt_mesh_model_is_extended(struct bt_mesh_model *model);
/** Node Composition */
struct bt_mesh_comp {
uint16_t cid; /**< Company ID */