Fix-Point commented on code in PR #16342:
URL: https://github.com/apache/nuttx/pull/16342#discussion_r2081174059
##########
sched/wqueue/kwork_queue.c:
##########
@@ -109,6 +106,13 @@ int work_queue_period_wq(FAR struct kwork_wqueue_s *wqueue,
flags = spin_lock_irqsave(&wqueue->lock);
+ /* Ensure the work has been removed. */
+
+ if (!work_available(work))
+ {
+ retimer |= work_remove(wqueue, work);
+ }
Review Comment:
Done.
##########
sched/wqueue/kwork_queue.c:
##########
@@ -81,18 +81,15 @@ int work_queue_period_wq(FAR struct kwork_wqueue_s *wqueue,
{
irqstate_t flags;
clock_t expected;
Review Comment:
Done.
##########
sched/wqueue/kwork_cancel.c:
##########
@@ -60,55 +61,50 @@ static int work_qcancel(FAR struct kwork_wqueue_s *wqueue,
bool sync,
flags = spin_lock_irqsave(&wqueue->lock);
- /* Check whether we own the work structure. */
-
if (!work_available(work))
{
- bool is_head = list_is_head(&wqueue->pending, &work->node);
-
- /* Seize the ownership from the work thread. */
-
- work->worker = NULL;
-
- list_delete(&work->node);
-
/* If the head of the pending queue has changed, we should reset
* the wqueue timer.
*/
- if (is_head)
+ if (work_remove(wqueue, work))
{
- if (!list_is_empty(&wqueue->pending))
- {
- work = list_first_entry(&wqueue->pending, struct work_s, node);
-
- ret = wd_start_abstick(&wqueue->timer, work->qtime,
- work_timer_expired, (wdparm_t)wqueue);
- }
- else
- {
- wd_cancel(&wqueue->timer);
- }
+ work_timer_reset(wqueue);
}
}
- else if (!up_interrupt_context() && !sched_idletask() && sync)
+
+ if (sync)
{
int wndx;
+ /* We can not cancel_sync in the interrupt and idletask context. */
+
+ DEBUGASSERT(!up_interrupt_context() && !sched_idletask());
+
+ /* Wait until the worker thread finished the work. */
Review Comment:
Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
