michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: mesh: health_srv: update k_work API

Browse source 
Switch to new work API.  Avoid a racy cancel by allowing the work
handler to deal with an immediate off when the time remaining changes
to zero.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2021-03-08 12:44:37 -06:00 • committed by Johan Hedberg
commit 81b9ba3a9b
2 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/bluetooth/mesh/health_srv.h
View file

@ -153,7 +153,7 @@ struct bt_mesh_health_srv {
const struct bt_mesh_health_srv_cb *cb; const struct bt_mesh_health_srv_cb *cb;
/** Attention Timer state */ /** Attention Timer state */
struct k_delayed_work attn_timer; struct k_work_delayable attn_timer;
}; };
/** @def BT_MESH_MODEL_HEALTH_SRV /** @def BT_MESH_MODEL_HEALTH_SRV

26
subsys/bluetooth/mesh/health_srv.c
View file

@ -222,7 +222,8 @@ static void send_attention_status(struct bt_mesh_model *model,
struct bt_mesh_health_srv *srv = model->user_data; struct bt_mesh_health_srv *srv = model->user_data;
uint8_t time; uint8_t time;
time = k_delayed_work_remaining_get(&srv->attn_timer) / 1000; time = k_ticks_to_ms_floor32(
k_work_delayable_remaining_get(&srv->attn_timer)) / 1000U;
BT_DBG("%u second%s", time, (time == 1U) ? "" : "s"); BT_DBG("%u second%s", time, (time == 1U) ? "" : "s");
bt_mesh_model_msg_init(&msg, OP_ATTENTION_STATUS); bt_mesh_model_msg_init(&msg, OP_ATTENTION_STATUS);
@ -374,9 +375,10 @@ int bt_mesh_fault_update(struct bt_mesh_elem *elem)
static void attention_off(struct k_work *work) static void attention_off(struct k_work *work)
{ {
struct bt_mesh_health_srv *srv = CONTAINER_OF(work, struct k_work_delayable *dwork = k_work_delayable_from_work(work);
struct bt_mesh_health_srv *srv = CONTAINER_OF(dwork,
struct bt_mesh_health_srv, struct bt_mesh_health_srv,
attn_timer.work); attn_timer);
BT_DBG(""); BT_DBG("");
if (srv->cb && srv->cb->attn_off) { if (srv->cb && srv->cb->attn_off) {
@ -400,7 +402,7 @@ static int health_srv_init(struct bt_mesh_model *model)
model->pub->update = health_pub_update; model->pub->update = health_pub_update;
k_delayed_work_init(&srv->attn_timer, attention_off); k_work_init_delayable(&srv->attn_timer, attention_off);
srv->model = model; srv->model = model;
@ -431,17 +433,9 @@ void bt_mesh_attention(struct bt_mesh_model *model, uint8_t time)
srv = model->user_data; srv = model->user_data;
} }
if (time > 0) { if ((time > 0) && srv->cb && srv->cb->attn_on) {
if (srv->cb && srv->cb->attn_on) { srv->cb->attn_on(model);
srv->cb->attn_on(model);
}
k_delayed_work_submit(&srv->attn_timer, K_SECONDS(time));
} else {
k_delayed_work_cancel(&srv->attn_timer);
if (srv->cb && srv->cb->attn_off) {
srv->cb->attn_off(model);
}
} }
k_work_reschedule(&srv->attn_timer, K_SECONDS(time));
} }