Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-16 01:43:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

system/nxinit: fix on-event actions re-running on every trigger

Browse source 
The `on <event>` action re-executed on every property poll because the
event pending flag was sticky: event_callback returned the same non-zero
pending value whether the event had just changed or had stayed satisfied
from an earlier change. init_action_foreach_event could not distinguish
an edge from a steady state and re-enqueued the action each round
(board_netinit ran 262 times per boot).

Introduce a three-state result (EVENT_STATE_UNSATISFIED / SATISFIED /
TRIGGERED). event_callback now returns TRIGGERED only on the edge where
pending flips false -> true. foreach folds per-event states into a
product clamped to TRIGGERED, enqueuing the action only when every event
is satisfied AND at least one fired this round.

Assisted-by: GitHubCopilot:claude-4.8-opus
Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
This commit is contained in:
wangjianyu3 2026-08-10 22:34:37 +08:00 • committed by Xiang Xiao
parent 1503c29f5d
commit 3328bbb0be
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
system/nxinit/action.c
View file

@ -216,6 +216,7 @@ static int event_callback(FAR struct action_manager_s *am,
init_debug("Trigger %s%s%s", event->key,
event->invert ? "!=" : "==",
event->value);
return EVENT_STATE_TRIGGERED;
}
}
@ -237,20 +238,18 @@ int init_action_foreach_event(FAR struct action_manager_s *am,
list_for_every_entry(&am->actions, a, struct action_s, node)
{
for (i = 0, m = 0; i < nitems(a->events) && a->events[i].key; i++)
for (i = 0, m = 1; i < nitems(a->events) && a->events[i].key; i++)
{
ret = cb(am, a, &a->events[i], arg);
if (ret < 0)
{
break;
}
else if (ret > 0)
{
m++;
}
m = MIN(m * ret, EVENT_STATE_TRIGGERED);
}
if (i > 0 && i == m)
if (m == EVENT_STATE_TRIGGERED)
{
add_ready(am, a);
}

12
system/nxinit/action.h
View file

@ -78,6 +78,18 @@ struct action_manager_s
FAR struct init_poller_s *prop;
};
/* Event evaluation result reported by init_action_event_cb.
* TRIGGERED means the event is satisfied and its key is the one that just
* changed, SATISFIED means it stays satisfied from an earlier change.
*/
enum action_event_state_e
{
EVENT_STATE_UNSATISFIED = 0,
EVENT_STATE_SATISFIED,
EVENT_STATE_TRIGGERED,
};
typedef CODE int (*init_action_event_cb)(FAR struct action_manager_s *,
FAR struct action_s *,
FAR struct action_event_s *,