bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: lwm2m: Fix pmin handling on tickless

Browse Source 
If observed resource was written during the pMin period, it did
not schedule any wake-up event into the future. Notify message would
then only be generated as a result of any other (like Update) event.

Refactor check_notifications() to follow same pattern as retransmit_req().
Return the next event timestamp, which could be now.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
This commit is contained in:
Seppo Takalo 2023-12-07 17:17:30 +02:00 committed by Carles Cufí
parent b8d887f0e1
commit 005dc60d24
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
subsys/net/lib/lwm2m/lwm2m_engine.c
View File

@ -581,14 +581,24 @@ void lwm2m_socket_del(struct lwm2m_ctx *ctx)
lwm2m_engine_wake_up();
}
static void check_notifications(struct lwm2m_ctx *ctx, const int64_t timestamp)
/* Generate notify messages. Return timestamp of next Notify event */
static int64_t check_notifications(struct lwm2m_ctx *ctx, const int64_t timestamp)
{
struct observe_node *obs;
int rc;
int64_t next = INT64_MAX;
lwm2m_registry_lock();
SYS_SLIST_FOR_EACH_CONTAINER(&ctx->observer, obs, node) {
if (!obs->event_timestamp || timestamp < obs->event_timestamp) {
if (!obs->event_timestamp) {
continue;
}
if (obs->event_timestamp < next) {
next = obs->event_timestamp;
}
if (timestamp < obs->event_timestamp) {
continue;
}
/* Check That There is not pending process*/
@ -604,6 +614,7 @@ static void check_notifications(struct lwm2m_ctx *ctx, const int64_t timestamp)
obs->event_timestamp =
engine_observe_shedule_next_event(obs, ctx->srv_obj_inst, timestamp);
obs->last_timestamp = timestamp;
if (!rc) {
/* create at most one notification */
goto cleanup;
@ -611,6 +622,7 @@ static void check_notifications(struct lwm2m_ctx *ctx, const int64_t timestamp)
}
cleanup:
lwm2m_registry_unlock();
return next;
}
static int socket_recv_message(struct lwm2m_ctx *client_ctx)
@ -704,7 +716,7 @@ static void socket_loop(void *p1, void *p2, void *p3)
int i, rc;
int64_t now, next;
int64_t timeout, next_retransmit;
int64_t timeout, next_tx;
bool rd_client_paused;
while (1) {
@ -741,12 +753,15 @@ static void socket_loop(void *p1, void *p2, void *p3)
if (!sys_slist_is_empty(&sock_ctx[i]->pending_sends)) {
continue;
}
next_retransmit = retransmit_request(sock_ctx[i], now);
if (next_retransmit < next) {
next = next_retransmit;
next_tx = retransmit_request(sock_ctx[i], now);
if (next_tx < next) {
next = next_tx;
}
if (lwm2m_rd_client_is_registred(sock_ctx[i])) {
check_notifications(sock_ctx[i], now);
next_tx = check_notifications(sock_ctx[i], now);
if (next_tx < next) {
next = next_tx;
}
}
}