Fix issues related to work queue timing
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2270 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
parent
99646ff19a
commit
e252d9d752
@ -2148,7 +2148,7 @@ extern void up_ledoff(int led);
|
|||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<code>CONFIG_SCHED_WORKPERIOD</code>: How often the worker thread checks for
|
<code>CONFIG_SCHED_WORKPERIOD</code>: How often the worker thread checks for
|
||||||
work. Default: 50 MS.
|
work in units of microseconds. Default: 50*1000 (50 MS).
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<code>CONFIG_SCHED_WORKSTACKSIZE</code>: The stack size allocated for the worker
|
<code>CONFIG_SCHED_WORKSTACKSIZE</code>: The stack size allocated for the worker
|
||||||
|
@ -256,7 +256,7 @@ defconfig -- This is a configuration file similar to the Linux
|
|||||||
CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
|
CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
|
||||||
thread. Default: 50
|
thread. Default: 50
|
||||||
CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
|
CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
|
||||||
work. Default: 50 MS.
|
work in units of microseconds. Default: 50*1000 (50 MS).
|
||||||
CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
|
CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
|
||||||
thread. Default: CONFIG_IDLETHREAD_STACKSIZE.
|
thread. Default: CONFIG_IDLETHREAD_STACKSIZE.
|
||||||
CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
|
CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
|
||||||
|
@ -307,7 +307,7 @@ CONFIG_HAVE_LIBM=n
|
|||||||
# CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
|
# CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
|
||||||
# thread. Default: 50
|
# thread. Default: 50
|
||||||
# CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
|
# CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
|
||||||
# work. Default: 50 MS.
|
# work in units of microseconds. Default: 50*1000 (50 MS).
|
||||||
# CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
|
# CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
|
||||||
# thread. Default: CONFIG_IDLETHREAD_STACKSIZE.
|
# thread. Default: CONFIG_IDLETHREAD_STACKSIZE.
|
||||||
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
|
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
|
||||||
@ -340,7 +340,7 @@ CONFIG_SDCLONE_DISABLE=y
|
|||||||
CONFIG_NXFLAT=n
|
CONFIG_NXFLAT=n
|
||||||
CONFIG_SCHED_WORKQUEUE=n
|
CONFIG_SCHED_WORKQUEUE=n
|
||||||
CONFIG_SCHED_WORKPRIORITY=50
|
CONFIG_SCHED_WORKPRIORITY=50
|
||||||
CONFIG_SCHED_WORKPERIOD=50
|
CONFIG_SCHED_WORKPERIOD=(50*1000)
|
||||||
CONFIG_SCHED_WORKSTACKSIZE=1024
|
CONFIG_SCHED_WORKSTACKSIZE=1024
|
||||||
CONFIG_SIG_SIGWORK=4
|
CONFIG_SIG_SIGWORK=4
|
||||||
|
|
||||||
|
@ -317,7 +317,7 @@ CONFIG_HAVE_LIBM=n
|
|||||||
# CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
|
# CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
|
||||||
# thread. Default: 50
|
# thread. Default: 50
|
||||||
# CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
|
# CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
|
||||||
# work. Default: 50 MS.
|
# work in units of microseconds. Default: 50*1000 (50 MS).
|
||||||
# CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
|
# CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
|
||||||
# thread. Default: CONFIG_IDLETHREAD_STACKSIZE.
|
# thread. Default: CONFIG_IDLETHREAD_STACKSIZE.
|
||||||
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
|
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
|
||||||
@ -349,7 +349,7 @@ CONFIG_SDCLONE_DISABLE=y
|
|||||||
CONFIG_NXFLAT=n
|
CONFIG_NXFLAT=n
|
||||||
CONFIG_SCHED_WORKQUEUE=y
|
CONFIG_SCHED_WORKQUEUE=y
|
||||||
CONFIG_SCHED_WORKPRIORITY=50
|
CONFIG_SCHED_WORKPRIORITY=50
|
||||||
CONFIG_SCHED_WORKPERIOD=50
|
CONFIG_SCHED_WORKPERIOD=(50*1000)
|
||||||
CONFIG_SCHED_WORKSTACKSIZE=1024
|
CONFIG_SCHED_WORKSTACKSIZE=1024
|
||||||
CONFIG_SIG_SIGWORK=4
|
CONFIG_SIG_SIGWORK=4
|
||||||
|
|
||||||
|
@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
|
|||||||
# CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
|
# CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
|
||||||
# thread. Default: 50
|
# thread. Default: 50
|
||||||
# CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
|
# CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
|
||||||
# work. Default: 50 MS.
|
# work in units of microseconds. Default: 50*1000 (50 MS).
|
||||||
# CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
|
# CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
|
||||||
# thread. Default: CONFIG_IDLETHREAD_STACKSIZE.
|
# thread. Default: CONFIG_IDLETHREAD_STACKSIZE.
|
||||||
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
|
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
|
||||||
@ -351,7 +351,7 @@ CONFIG_SDCLONE_DISABLE=y
|
|||||||
CONFIG_NXFLAT=n
|
CONFIG_NXFLAT=n
|
||||||
CONFIG_SCHED_WORKQUEUE=n
|
CONFIG_SCHED_WORKQUEUE=n
|
||||||
CONFIG_SCHED_WORKPRIORITY=50
|
CONFIG_SCHED_WORKPRIORITY=50
|
||||||
CONFIG_SCHED_WORKPERIOD=50
|
CONFIG_SCHED_WORKPERIOD=(50*1000)
|
||||||
CONFIG_SCHED_WORKSTACKSIZE=1024
|
CONFIG_SCHED_WORKSTACKSIZE=1024
|
||||||
CONFIG_SIG_SIGWORK=4
|
CONFIG_SIG_SIGWORK=4
|
||||||
|
|
||||||
|
@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
|
|||||||
# CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
|
# CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
|
||||||
# thread. Default: 50
|
# thread. Default: 50
|
||||||
# CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
|
# CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
|
||||||
# work. Default: 50 MS.
|
# work in units of microseconds. Default: 50*1000 (50 MS).
|
||||||
# CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
|
# CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
|
||||||
# thread. Default: CONFIG_IDLETHREAD_STACKSIZE.
|
# thread. Default: CONFIG_IDLETHREAD_STACKSIZE.
|
||||||
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
|
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
|
||||||
@ -352,7 +352,7 @@ CONFIG_SDCLONE_DISABLE=y
|
|||||||
CONFIG_NXFLAT=n
|
CONFIG_NXFLAT=n
|
||||||
CONFIG_SCHED_WORKQUEUE=n
|
CONFIG_SCHED_WORKQUEUE=n
|
||||||
CONFIG_SCHED_WORKPRIORITY=50
|
CONFIG_SCHED_WORKPRIORITY=50
|
||||||
CONFIG_SCHED_WORKPERIOD=50
|
CONFIG_SCHED_WORKPERIOD=(50*1000)
|
||||||
CONFIG_SCHED_WORKSTACKSIZE=1024
|
CONFIG_SCHED_WORKSTACKSIZE=1024
|
||||||
CONFIG_SIG_SIGWORK=4
|
CONFIG_SIG_SIGWORK=4
|
||||||
|
|
||||||
|
@ -103,17 +103,24 @@ int work_thread(int argc, char *argv[])
|
|||||||
volatile FAR struct work_s *work;
|
volatile FAR struct work_s *work;
|
||||||
worker_t worker;
|
worker_t worker;
|
||||||
FAR void *arg;
|
FAR void *arg;
|
||||||
|
uint32 elapsed;
|
||||||
|
uint32 remaining;
|
||||||
|
uint32 next;
|
||||||
|
int usec;
|
||||||
irqstate_t flags;
|
irqstate_t flags;
|
||||||
|
|
||||||
/* Loop forever */
|
/* Loop forever */
|
||||||
|
|
||||||
|
usec = CONFIG_SCHED_WORKPERIOD;
|
||||||
|
flags = irqsave();
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
/* Wait awhile to check the work list. We will wait here until either
|
/* Wait awhile to check the work list. We will wait here until either
|
||||||
* the time elapses or until we are awakened by a signal.
|
* the time elapses or until we are awakened by a signal.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
usleep(CONFIG_SCHED_WORKPERIOD);
|
usleep(usec);
|
||||||
|
irqrestore(flags);
|
||||||
|
|
||||||
/* First, perform garbage collection. This cleans-up memory de-allocations
|
/* First, perform garbage collection. This cleans-up memory de-allocations
|
||||||
* that were queued because they could not be freed in that execution
|
* that were queued because they could not be freed in that execution
|
||||||
@ -128,15 +135,19 @@ int work_thread(int argc, char *argv[])
|
|||||||
* we process items in the work list.
|
* we process items in the work list.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
next = CONFIG_SCHED_WORKPERIOD / USEC_PER_TICK;
|
||||||
flags = irqsave();
|
flags = irqsave();
|
||||||
work = (FAR struct work_s *)g_work.head;
|
work = (FAR struct work_s *)g_work.head;
|
||||||
while (work)
|
while (work)
|
||||||
{
|
{
|
||||||
/* Is this work ready? It is ready if there is no delay or if
|
/* Is this work ready? It is ready if there is no delay or if
|
||||||
* the delay has elapsed.
|
* the delay has elapsed. qtime is the time that the work was added
|
||||||
|
* to the work queue. It will always be greater than or equal to
|
||||||
|
* zero. Therefore a delay of zero will always execute immediately.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (work->delay == 0 || g_system_timer - work->qtime > work->delay)
|
elapsed = g_system_timer - work->qtime;
|
||||||
|
if (elapsed >= work->delay)
|
||||||
{
|
{
|
||||||
/* Remove the ready-to-execute work from the list */
|
/* Remove the ready-to-execute work from the list */
|
||||||
|
|
||||||
@ -166,12 +177,27 @@ int work_thread(int argc, char *argv[])
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* This one is not ready, try the next in the list. */
|
/* This one is not ready.. will it be ready before the next
|
||||||
|
* scheduled wakeup interval?
|
||||||
|
*/
|
||||||
|
|
||||||
|
remaining = elapsed - work->delay;
|
||||||
|
if (remaining < next)
|
||||||
|
{
|
||||||
|
/* Yes.. Then schedule to wake up when the work is ready */
|
||||||
|
|
||||||
|
next = remaining;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Then try the next in the list. */
|
||||||
|
|
||||||
work = (FAR struct work_s *)work->dq.flink;
|
work = (FAR struct work_s *)work->dq.flink;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
irqrestore(flags);
|
|
||||||
|
/* Now calculate the microsecond delay we should wait */
|
||||||
|
|
||||||
|
usec = next * USEC_PER_TICK;
|
||||||
}
|
}
|
||||||
|
|
||||||
return OK; /* To keep some compilers happy */
|
return OK; /* To keep some compilers happy */
|
||||||
|
Loading…
Reference in New Issue
Block a user