Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[timer]add all soft timer config #9048

Merged
merged 4 commits into from
Jun 19, 2024
Merged

[timer]add all soft timer config #9048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a42eb0
add all soft timer
zmshahaha Jun 7, 2024
dfa325a
update wq
zmshahaha Jun 11, 2024
35c884c
add timer test
zmshahaha Jun 12, 2024
3b1fdaf
shield LOG_D
zmshahaha Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 12 additions & 23 deletions components/drivers/ipc/workqueue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
struct rt_work *work, rt_tick_t ticks)
{
rt_base_t level;
rt_err_t err;
rt_err_t err = RT_EOK;

level = rt_spin_lock_irqsave(&(queue->spinlock));

Expand All @@ -113,13 +113,7 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
{
/* resume work thread, and do a re-schedule if succeed */
rt_thread_resume(queue->work_thread);
rt_spin_unlock_irqrestore(&(queue->spinlock), level);
}
else
{
rt_spin_unlock_irqrestore(&(queue->spinlock), level);
}
return RT_EOK;
}
else if (ticks < RT_TICK_MAX / 2)
{
Expand All @@ -139,12 +133,14 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
rt_list_insert_after(queue->delayed_list.prev, &(work->list));

err = rt_timer_start(&(work->timer));
rt_spin_unlock_irqrestore(&(queue->spinlock), level);

return err;
}
else
{
err = - RT_ERROR;
}

rt_spin_unlock_irqrestore(&(queue->spinlock), level);
return -RT_ERROR;
return err;
}

static rt_err_t _workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work)
Expand All @@ -160,14 +156,14 @@ static rt_err_t _workqueue_cancel_work(struct rt_workqueue *queue, struct rt_wor
{
if ((err = rt_timer_stop(&(work->timer))) != RT_EOK)
{
rt_spin_unlock_irqrestore(&(queue->spinlock), level);
return err;
goto exit;
}
rt_timer_detach(&(work->timer));
work->flags &= ~RT_WORK_STATE_SUBMITTING;
}
err = queue->work_current != work ? RT_EOK : -RT_EBUSY;
work->workqueue = RT_NULL;
exit:
rt_spin_unlock_irqrestore(&(queue->spinlock), level);
return err;
}
Expand Down Expand Up @@ -200,12 +196,9 @@ static void _delayed_work_timeout_handler(void *parameter)
{
/* resume work thread, and do a re-schedule if succeed */
rt_thread_resume(queue->work_thread);
rt_spin_unlock_irqrestore(&(queue->spinlock), level);
}
else
{
rt_spin_unlock_irqrestore(&(queue->spinlock), level);
}

rt_spin_unlock_irqrestore(&(queue->spinlock), level);
}

/**
Expand Down Expand Up @@ -358,13 +351,9 @@ rt_err_t rt_workqueue_urgent_work(struct rt_workqueue *queue, struct rt_work *wo
{
/* resume work thread, and do a re-schedule if succeed */
rt_thread_resume(queue->work_thread);
rt_spin_unlock_irqrestore(&(queue->spinlock), level);
}
else
{
rt_spin_unlock_irqrestore(&(queue->spinlock), level);
}

rt_spin_unlock_irqrestore(&(queue->spinlock), level);
return RT_EOK;
}

Expand Down
Loading
Loading