Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 16:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for delays of different durations in work queue processing

Browse Source
This commit is contained in:
Gregory Nutt
2014-10-10 13:21:37 -06:00
parent 75e7a4dbfc
commit 16a3e83258
10 changed files with 103 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libc/wqueue/work_process.c
+22 -12
View File
@@ -64,9 +64,9 @@
# define WORK_CLOCK CLOCK_REALTIME
#endif
/* The work poll period is in system ticks. */
#define WORKPERIOD_TICKS (CONFIG_SCHED_WORKPERIOD / USEC_PER_TICK)
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
/****************************************************************************
* Private Type Declarations
@@ -121,7 +121,7 @@ void work_process(FAR struct wqueue_s *wqueue)
* we process items in the work list.
*/
next = WORKPERIOD_TICKS;
next = wqueue->delay;
flags = irqsave();
/* Get the time that we started this polling cycle in clock ticks. */
@@ -221,18 +221,28 @@ void work_process(FAR struct wqueue_s *wqueue)
}
}
/* There is no work to be performed now. Check if we need to delay or if we have
* already exceed the duration of the polling period.
*/
/* Get the delay (in clock ticks) since we started the sampling */
if (next < WORKPERIOD_TICKS)
elapsed = clock_systimer() - work->qtime;
if (elapsed <= wqueue->delay)
{
/* Wait awhile to check the work list. We will wait here until either
* the time elapses or until we are awakened by a signal. Interrupts
* will be re-enabled while we wait.
/* How must time would we need to delay to get to the end of the
* sampling period? The amount of time we delay should be the smaller
* of the time to the end of the sampling period and the time to the
* next work expiry.
*/
usleep(next * USEC_PER_TICK);
remaining = wqueue->delay - elapsed;
next = MIN(next, remaining);
if (next > 0)
{
/* Wait awhile to check the work list. We will wait here until
* either the time elapses or until we are awakened by a signal.
* Interrupts will be re-enabled while we wait.
*/
usleep(next * USEC_PER_TICK);
}
}
irqrestore(flags);
libc/wqueue/work_queue.c
+1 -1
View File
@@ -127,7 +127,7 @@ int work_qqueue(FAR struct wqueue_s *wqueue, FAR struct work_s *work,
work->qtime = clock_systimer(); /* Time work queued */
dq_addlast((FAR dq_entry_t *)work, &wqueue->q);
kill(wqueue->pid, SIGWORK); /* Wake up the worker thread */
kill(wqueue->pid[0], SIGWORK); /* Wake up the worker thread */
irqrestore(flags);
return OK;
libc/wqueue/work_signal.c
+1 -1
View File
@@ -96,7 +96,7 @@ int work_signal(int qid)
{
/* Signal the worker thread */
ret = kill(g_usrwork.pid, SIGWORK);
ret = kill(g_usrwork.pid[0], SIGWORK);
if (ret < 0)
{
int errcode = errno;
libc/wqueue/work_usrthread.c
+10 -8
View File
@@ -44,6 +44,7 @@
#include <debug.h>
#include <nuttx/wqueue.h>
#include <nuttx/clock.h>
#if defined(CONFIG_SCHED_WORKQUEUE) && defined(CONFIG_SCHED_USRWORK) && \
!defined(__KERNEL__)
@@ -130,20 +131,21 @@ int work_usrstart(void)
{
/* Initialize work queue data structures */
g_usrwork.delay = CONFIG_SCHED_USRWORKPERIOD / USEC_PER_TICK;
dq_init(&g_usrwork.q);
/* Start a user-mode worker thread for use by applications. */
svdbg("Starting user-mode worker thread\n");
g_usrwork.pid = task_create("uwork",
CONFIG_SCHED_USRWORKPRIORITY,
CONFIG_SCHED_USRWORKSTACKSIZE,
(main_t)work_usrthread,
(FAR char * const *)NULL);
g_usrwork.pid[0] = task_create("uwork",
CONFIG_SCHED_USRWORKPRIORITY,
CONFIG_SCHED_USRWORKSTACKSIZE,
(main_t)work_usrthread,
(FAR char * const *)NULL);
DEBUGASSERT(g_usrwork.pid > 0);
if (g_usrwork.pid < 0)
DEBUGASSERT(g_usrwork.pid[0] > 0);
if (g_usrwork.pid[0] < 0)
{
int errcode = errno;
DEBUGASSERT(errcode > 0);
@@ -152,7 +154,7 @@ int work_usrstart(void)
return -errcode;
}
return g_usrwork.pid;
return g_usrwork.pid[0];
}
#endif /* CONFIG_SCHED_WORKQUEUE && CONFIG_SCHED_USRWORK && !__KERNEL__*/