phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Add test of roundrobin scheduler (still does not work) 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@81 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2007-03-17 21:32:21 +00:00
parent 59f8dbd3a0
commit ee0bedc26f
10 changed files with 265 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nuttx/arch/c5471/src/up_reprioritizertr.c
View File

@ -155,12 +155,13 @@ void up_reprioritize_rtr(_TCB *tcb, ubyte priority)
up_copystate(current_regs, rtcb->xcp.regs);
}
/* Copy the exception context into the TCB at the (old) head of the
* g_readytorun Task list. if up_saveusercontext returns a non-zero
* value, then this is really the previously running task restarting!
*/
if (!up_saveusercontext(rtcb->xcp.regs))
else if (!up_saveusercontext(rtcb->xcp.regs))
{
/* Restore the exception context of the rtcb at the (new) head
* of the g_readytorun task list.

3
nuttx/arch/dm320/src/up_reprioritizertr.c
View File

@ -155,12 +155,13 @@ void up_reprioritize_rtr(_TCB *tcb, ubyte priority)
up_copystate(current_regs, rtcb->xcp.regs);
}
/* Copy the exception context into the TCB at the (old) head of the
* g_readytorun Task list. if up_saveusercontext returns a non-zero
* value, then this is really the previously running task restarting!
*/
if (!up_saveusercontext(rtcb->xcp.regs))
else if (!up_saveusercontext(rtcb->xcp.regs))
{
/* Restore the exception context of the rtcb at the (new) head
* of the g_readytorun task list.

4
nuttx/arch/pjrc-8051/src/up_reprioritizertr.c
View File

@ -134,7 +134,7 @@ void up_reprioritize_rtr(FAR _TCB *tcb, ubyte priority)
sched_mergepending();
}
/* Are we in an interrupt handler? */
/* Are we in an interrupt handler? */
if (g_irqtos)
{
@ -163,7 +163,7 @@ void up_reprioritize_rtr(FAR _TCB *tcb, ubyte priority)
* value, then this is really the previously running task restarting!
*/
if (!up_savecontext(&rtcb->xcp))
else if (!up_savecontext(&rtcb->xcp))
{
/* Restore the exception context of the rtcb at the (new) head
* of the g_readytorun task list.

2
nuttx/arch/sim/defconfig
View File

@ -73,7 +73,7 @@ CONFIG_DEBUG=y
CONFIG_DEBUG_VERBOSE=y
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
CONFIG_RR_INTERVAL=0
CONFIG_SCHED_INSTRUMENTATION=n
CONFIG_TASK_NAME_SIZE=32
CONFIG_START_YEAR=2007

2
nuttx/examples/ostest/Makefile
View File

@ -42,7 +42,7 @@ ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = main.c dev_null.c
ifneq ($(CONFIG_DISABLE_PTHREAD),y)
CSRCS += cancel.c cond.c mutex.c sem.c
CSRCS += cancel.c cond.c mutex.c sem.c roundrobin.c
endif
ifneq ($(CONFIG_DISABLE_SIGNALS),y)
CSRCS += sighand.c

8
nuttx/examples/ostest/main.c
View File

@ -164,6 +164,14 @@ static int user_main(int argc, char *argv[])
sighand_test();
#endif
#if 0 /* Does not work yet */
#if !defined(CONFIG_DISABLE_PTHREAD) && CONFIG_RR_INTERVAL > 0
/* Verify round robin scheduling */
rr_test();
#endif
#endif
printf("user_main: Exitting\n");
return 0;
}

4
nuttx/examples/ostest/ostest.h
View File

@ -92,4 +92,8 @@ extern void timedwait_test(void);
extern void sighand_test(void);
/* roundrobin.c *********************************************/
extern void rr_test(void);
#endif /* __OSTEST_H */

212
nuttx/examples/ostest/roundrobin.c Normal file
View File

@ -0,0 +1,212 @@
/********************************************************************************
* dev_null.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name Gregory Nutt nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
********************************************************************************/
/********************************************************************************
* Included Files
********************************************************************************/
#include <nuttx/config.h>
#include <stdio.h>
#include "ostest.h"
#if CONFIG_RR_INTERVAL > 0
/********************************************************************************
* Definitions
********************************************************************************/
#define CONFIG_NINTEGERS 32768
/********************************************************************************
* Private Data
********************************************************************************/
static int prime1[CONFIG_NINTEGERS];
static int prime2[CONFIG_NINTEGERS];
/********************************************************************************
* Private Functions
********************************************************************************/
/********************************************************************************
* Name: dosieve
*
* Description
* This implements a "sieve of aristophanes" algorithm for finding prime number.
* Credit for this belongs to someone, but I am not sure who anymore. Anyway,
* the only purpose here is that we need some algorithm that takes a long period
* of time to execute.
*
********************************************************************************/
static void dosieve(int *prime)
{
int a,d;
int i;
int j;
a = 2;
d = a;
for (i = 0; i < CONFIG_NINTEGERS; i++)
{
prime[i] = i+2;
}
for (i = 1; i < 10; i++)
{
for (j = 0; j < CONFIG_NINTEGERS; j++)
{
d = a + d;
if (d < CONFIG_NINTEGERS)
{
prime[d]=0;
}
}
a++;
d = a;
i++;
}
#if 0 /* We don't really care what the numbers are */
for (i = 0, j= 0; i < CONFIG_NINTEGERS; i++)
{
if (prime[i] != 0)
{
printf(" Prime %d: %d\n", j, prime[i]);
j++;
}
}
#endif
}
/********************************************************************************
* Name: sieve1
********************************************************************************/
static void *sieve1(void *parameter)
{
int i;
printf("sieve1 started\n");
for (i = 0; i < 1000; i++)
{
dosieve(prime1);
}
pthread_exit(NULL);
}
/********************************************************************************
* Name: sieve2
********************************************************************************/
static void *sieve2(void *parameter)
{
int i;
printf("sieve2 started\n");
for (i = 0; i < 1000; i++)
{
dosieve(prime2);
}
pthread_exit(NULL);
}
/********************************************************************************
* Public Functions
********************************************************************************/
/********************************************************************************
* Name: rr_test
********************************************************************************/
void rr_test(void)
{
pthread_t sieve1_thread;
pthread_t sieve2_thread;
struct sched_param sparam;
pthread_attr_t attr;
pthread_addr_t result;
int status;
printf("rr_test: Starting sieve1 thread \n");
status = pthread_attr_init(&attr);
if (status != OK)
{
printf("rr_test: pthread_attr_init failed, status=%d\n", status);
}
sparam.sched_priority = sched_get_priority_min(SCHED_FIFO);
status = pthread_attr_setschedparam(&attr, &sparam);
if (status != OK)
{
printf("rr_test: pthread_attr_setschedparam failed, status=%d\n", status);
}
else
{
printf("rr_test: Set thread priority to %d\n", sparam.sched_priority);
}
status = pthread_attr_setschedpolicy(&attr, SCHED_RR);
if (status != OK)
{
printf("rr_test: pthread_attr_setschedpolicy failed, status=%d\n", status);
}
else
{
printf("rr_test: Set thread policty to SCHED_RR\n");
}
status = pthread_create(&sieve1_thread, &attr, sieve1, NULL);
if (status != 0)
{
printf("rr_test: Error in thread 1 creation, status=%d\n", status);
}
printf("rr_test: Starting sieve1 thread \n");
status = pthread_create(&sieve2_thread, &attr, sieve2, NULL);
if (status != 0)
{
printf("rr_test: Error in thread 2 creation, status=%d\n", status);
}
printf("rr_test: Waiting for sieves to complete\n");
pthread_join(sieve2_thread, &result);
pthread_join(sieve1_thread, &result);
printf("rr_test: Done\n");
}
#endif /* CONFIG_RR_INTERVAL */

10
nuttx/sched/sched_addreadytorun.c
View File

@ -92,6 +92,7 @@
* whatever list it was in.
* - The caller handles the condition that occurs if the
* the head of the g_readytorun list is changed.
*
************************************************************/
boolean sched_addreadytorun(FAR _TCB *btcb)
@ -99,14 +100,15 @@ boolean sched_addreadytorun(FAR _TCB *btcb)
FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head;
boolean ret;
/* Check if pre-emption is disabled for the current running task and
* if the rtrTask would cause the current running task to be preempted.
/* Check if pre-emption is disabled for the current running
* task and if the new ready-to-run task would cause the
* current running task to be preempted.
*/
if (rtcb->lockcount && rtcb->sched_priority < btcb->sched_priority)
{
/* Yes. Preemption would occur! Add the btcb to the g_pendingtasks
* task list for now.
/* Yes. Preemption would occur! Add the new ready-to-run
* task to the g_pendingtasks task list for now.
*/
sched_addprioritized(btcb, &g_pendingtasks);

44
nuttx/sched/sched_processtimer.c
View File

@ -91,31 +91,41 @@ static void sched_process_timeslice(void)
if (rtcb->timeslice <= 1)
{
/* We know we are at the head of the ready to run
* prioritized list. We must be the highest priority
* task eligible for execution. Check the next task
* in the ready to run list. If it is the same
* priority, then we need to relinquish the CPU and
* give that task a shot.
/* Yes, Now check if the task has pre-emption disabled.
* If so, then we will freeze the timeslice count at
* the value until the next tick after pre-emption
* has been enabled.
*/
if (rtcb->flink &&
rtcb->flink->sched_priority >= rtcb->sched_priority)
if (!rtcb->lockcount)
{
struct sched_param param;
/* Reset the timeslice */
/* Reset the timeslice in any case. */
rtcb->timeslice = CONFIG_RR_INTERVAL;
/* Just resetting the task priority to its current
* value. This this will cause the task to be
* rescheduled behind any other tasks at the same
* priority.
/* We know we are at the head of the ready to run
* prioritized list. We must be the highest priority
* task eligible for execution. Check the next task
* in the ready to run list. If it is the same
* priority, then we need to relinquish the CPU and
* give that task a shot.
*/
param.sched_priority = rtcb->sched_priority;
(void)sched_setparam(0, &param);
if (rtcb->flink &&
rtcb->flink->sched_priority >= rtcb->sched_priority)
{
struct sched_param param;
/* Just resetting the task priority to its current
* value. This this will cause the task to be
* rescheduled behind any other tasks at the same
* priority.
*/
param.sched_priority = rtcb->sched_priority;
(void)sched_setparam(0, &param);
}
}
}
else