diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-05-20 15:43:53 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-05-20 15:43:53 +0000 |
| commit | 14a668aeb4737d86fb27a88ca13d85590d695c7c (patch) | |
| tree | 6ce96e7edc2757212935b93f1e220a4673933f12 | |
| parent | b1877fc48db3c0f6b2cdaa82408e6dd22367bae6 (diff) | |
| download | px4-nuttx-14a668aeb4737d86fb27a88ca13d85590d695c7c.tar.gz px4-nuttx-14a668aeb4737d86fb27a88ca13d85590d695c7c.tar.bz2 px4-nuttx-14a668aeb4737d86fb27a88ca13d85590d695c7c.zip | |
Fix timeslice calculation
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@232 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/arch/arm/src/common/up_unblocktask.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/c5471/src/up_unblocktask.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/dm320/src/up_unblocktask.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/pjrc-8051/src/up_unblocktask.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/sim/src/up_unblocktask.c | 2 | ||||
| -rw-r--r-- | nuttx/sched/pthread_create.c | 2 | ||||
| -rw-r--r-- | nuttx/sched/sched_processtimer.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/nuttx/arch/arm/src/common/up_unblocktask.c b/nuttx/arch/arm/src/common/up_unblocktask.c index 97c416182..f907c6161 100644 --- a/nuttx/arch/arm/src/common/up_unblocktask.c +++ b/nuttx/arch/arm/src/common/up_unblocktask.c @@ -101,7 +101,7 @@ void up_unblock_task(_TCB *tcb) */ #if CONFIG_RR_INTERVAL > 0 - tcb->timeslice = CONFIG_RR_INTERVAL; + tcb->timeslice = CONFIG_RR_INTERVAL / MSEC_PER_SEC; #endif /* Add the task in the correct location in the prioritized diff --git a/nuttx/arch/c5471/src/up_unblocktask.c b/nuttx/arch/c5471/src/up_unblocktask.c index a51a5d621..0d7f91ca5 100644 --- a/nuttx/arch/c5471/src/up_unblocktask.c +++ b/nuttx/arch/c5471/src/up_unblocktask.c @@ -101,7 +101,7 @@ void up_unblock_task(_TCB *tcb) */ #if CONFIG_RR_INTERVAL > 0 - tcb->timeslice = CONFIG_RR_INTERVAL; + tcb->timeslice = CONFIG_RR_INTERVAL / MSEC_PER_SEC; #endif /* Add the task in the correct location in the prioritized diff --git a/nuttx/arch/dm320/src/up_unblocktask.c b/nuttx/arch/dm320/src/up_unblocktask.c index 15efb7a47..c17760b87 100644 --- a/nuttx/arch/dm320/src/up_unblocktask.c +++ b/nuttx/arch/dm320/src/up_unblocktask.c @@ -100,7 +100,7 @@ void up_unblock_task(_TCB *tcb) */ #if CONFIG_RR_INTERVAL > 0 - tcb->timeslice = CONFIG_RR_INTERVAL; + tcb->timeslice = CONFIG_RR_INTERVAL / MSEC_PER_SEC; #endif /* Add the task in the correct location in the prioritized diff --git a/nuttx/arch/pjrc-8051/src/up_unblocktask.c b/nuttx/arch/pjrc-8051/src/up_unblocktask.c index 005e74e54..2f242fe0f 100644 --- a/nuttx/arch/pjrc-8051/src/up_unblocktask.c +++ b/nuttx/arch/pjrc-8051/src/up_unblocktask.c @@ -101,7 +101,7 @@ void up_unblock_task(FAR _TCB *tcb) */ #if CONFIG_RR_INTERVAL > 0 - tcb->timeslice = CONFIG_RR_INTERVAL; + tcb->timeslice = CONFIG_RR_INTERVAL / MSEC_PER_SEC; #endif /* Add the task in the correct location in the prioritized diff --git a/nuttx/arch/sim/src/up_unblocktask.c b/nuttx/arch/sim/src/up_unblocktask.c index bf3148506..b17fd4d48 100644 --- a/nuttx/arch/sim/src/up_unblocktask.c +++ b/nuttx/arch/sim/src/up_unblocktask.c @@ -100,7 +100,7 @@ void up_unblock_task(_TCB *tcb) */ #if CONFIG_RR_INTERVAL > 0 - tcb->timeslice = CONFIG_RR_INTERVAL; + tcb->timeslice = CONFIG_RR_INTERVAL / MSEC_PER_SEC; #endif /* Add the task in the correct location in the prioritized diff --git a/nuttx/sched/pthread_create.c b/nuttx/sched/pthread_create.c index 8247ed78e..058541126 100644 --- a/nuttx/sched/pthread_create.c +++ b/nuttx/sched/pthread_create.c @@ -365,7 +365,7 @@ int pthread_create(pthread_t *thread, pthread_attr_t *attr, if (policy == SCHED_RR) { ptcb->flags |= TCB_FLAG_ROUND_ROBIN; - ptcb->timeslice = CONFIG_RR_INTERVAL; + ptcb->timeslice = CONFIG_RR_INTERVAL / MSEC_PER_TICK; } #endif diff --git a/nuttx/sched/sched_processtimer.c b/nuttx/sched/sched_processtimer.c index 186de78d2..6cbca4776 100644 --- a/nuttx/sched/sched_processtimer.c +++ b/nuttx/sched/sched_processtimer.c @@ -103,7 +103,7 @@ static void sched_process_timeslice(void) { /* Reset the timeslice in any case. */ - rtcb->timeslice = CONFIG_RR_INTERVAL; + rtcb->timeslice = CONFIG_RR_INTERVAL / MSEC_PER_TICK; /* We know we are at the head of the ready to run * prioritized list. We must be the highest priority |