anchao commented on code in PR #16342:
URL: https://github.com/apache/nuttx/pull/16342#discussion_r2081121374
##########
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:
```suggestion
}
else
{
retimer = false;
}
```
##########
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:
```suggestion
sync_wait = NULL;
/* Wait until the worker thread finished the work. */
```
##########
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());
Review Comment:
remove, already checked on nxsem_wait_uninterruptible
##########
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:
```suggestion
clock_t expected;
```
##########
sched/wqueue/kwork_queue.c:
##########
@@ -134,6 +139,11 @@ int work_queue_period_wq(FAR struct kwork_wqueue_s *wqueue,
wake = true;
}
+ if (retimer)
+ {
+ work_timer_reset(wqueue);
+ }
+
spin_unlock_irqrestore(&wqueue->lock, flags);
if (wake)
Review Comment:
```suggestion
if (delay == 0)
```
##########
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;
- bool wake = false;
- int ret = OK;
+ bool retimer = false;
+ bool wake = false;
+ int ret = OK;
Review Comment:
```suggestion
```
##########
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. */
+
for (wndx = 0; wndx < wqueue->nthreads; wndx++)
{
if (wqueue->worker[wndx].work == work &&
wqueue->worker[wndx].pid != nxsched_gettid())
{
wqueue->worker[wndx].wait_count++;
- spin_unlock_irqrestore(&wqueue->lock, flags);
- nxsem_wait_uninterruptible(&wqueue->worker[wndx].wait);
- return 1;
+ sync_wait = &wqueue->worker[wndx].wait;
+
+ /* Return 1 means waiting for it to finish. */
+
+ ret = 1;
Review Comment:
why need 1?
--
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
