GUIDINGLI commented on code in PR #16231:
URL: https://github.com/apache/nuttx/pull/16231#discussion_r2063219741
##########
sched/wqueue/kwork_queue.c:
##########
@@ -141,65 +80,50 @@ int work_queue_period_wq(FAR struct kwork_wqueue_s *wqueue,
FAR void *arg, clock_t delay, clock_t period)
{
irqstate_t flags;
+ clock_t expected;
int ret = OK;
if (wqueue == NULL || work == NULL || worker == NULL)
{
return -EINVAL;
}
+ if (!delay)
+ {
+ expected = clock_systime_ticks();
+ }
+ else
+ {
+ expected = clock_systime_ticks() + delay + 1;
+ }
+
/* Interrupts are disabled so that this logic can be called from with
* task logic or from interrupt handling logic.
*/
flags = spin_lock_irqsave(&wqueue->lock);
sched_lock();
- /* Remove the entry from the timer and work queue. */
+ /* Check whether we own the work structure. */
- if (work->worker != NULL)
+ if (!work_available(work))
{
- /* Remove the entry from the work queue and make sure that it is
- * marked as available (i.e., the worker field is nullified).
- */
+ /* Seize the ownership from the work thread. */
- work->worker = NULL;
- wd_cancel(&work->u.timer);
- if (dq_inqueue((FAR dq_entry_t *)work, &wqueue->q))
- {
- dq_rem((FAR dq_entry_t *)work, &wqueue->q);
- }
- }
-
- if (work_is_canceling(wqueue->worker, wqueue->nthreads, work))
- {
- goto out;
+ list_delete(&work->node);
}
/* Initialize the work structure. */
- work->worker = worker; /* Work callback. non-NULL means queued */
- work->arg = arg; /* Callback argument */
- work->wq = wqueue; /* Work queue */
+ work->worker = worker; /* Work callback. non-NULL means queued */
+ work->arg = arg; /* Callback argument */
+ work->qtime = expected; /* Expected time */
+ work->period = period; /* Periodical delay */
- /* Queue the new work */
+ /* Insert to the pending list of the wqueue. */
- if (!delay)
- {
- queue_work(wqueue, work);
- }
- else if (period == 0)
- {
- ret = wd_start(&work->u.timer, delay,
- work_timer_expiry, (wdparm_t)work);
- }
- else
- {
- ret = wd_start_period(&work->u.ptimer, delay, period,
- work_timer_expiry, (wdparm_t)work);
- }
+ work_insert_pending(wqueue, work);
Review Comment:
if the delay is zero, then directly add to ready list ?
--
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
