sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Partial (non-working) checked in before the big, risky automated change

Browse Source
This commit is contained in:
Gregory Nutt 2014-08-08 17:29:44 -06:00
parent 224ee05957
commit ccf4ed2148
35 changed files with 71 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sched/Makefile
View File

@ -38,43 +38,11 @@
VPATH =
DEPPATH = --dep-path .
ASRCS =
SCHED_SRCS = sched_garbage.c sched_getfiles.c
SCHED_SRCS += sched_addreadytorun.c sched_removereadytorun.c sched_addprioritized.c
SCHED_SRCS += sched_mergepending.c sched_addblocked.c sched_removeblocked.c
SCHED_SRCS += sched_free.c sched_gettcb.c sched_verifytcb.c sched_releasetcb.c
SCHED_SRCS += sched_getsockets.c sched_getstreams.c
SCHED_SRCS += sched_setparam.c sched_setpriority.c sched_getparam.c
SCHED_SRCS += sched_setscheduler.c sched_getscheduler.c
SCHED_SRCS += sched_yield.c sched_rrgetinterval.c sched_foreach.c
SCHED_SRCS += sched_lock.c sched_unlock.c sched_lockcount.c sched_self.c
ifeq ($(CONFIG_PRIORITY_INHERITANCE),y)
SCHED_SRCS += sched_reprioritize.c
endif
ifeq ($(CONFIG_SCHED_WAITPID),y)
SCHED_SRCS += sched_waitpid.c
ifeq ($(CONFIG_SCHED_HAVE_PARENT),y)
SCHED_SRCS += sched_waitid.c sched_wait.c
endif
endif
ifeq ($(CONFIG_SCHED_CPULOAD),y)
SCHED_SRCS += sched_cpuload.c
endif
ifeq ($(CONFIG_SCHED_TICKLESS),y)
SCHED_SRCS += sched_timerexpiration.c
else
SCHED_SRCS += sched_processtimer.c
endif
include init/Make.defs
include irq/Make.defs
include paging/Make.defs
include group/Make.defs
include sched/Make.defs
include task/Make.defs
include errno/Make.defs
include wdog/Make.defs
@ -89,6 +57,8 @@ include environ/Make.defs
# REVISIT
TSK_SRCS += exit.c
ASRCS =
CSRCS = $(INIT_SRCS) $(IRQ_SRCS) $(PG_SRCS) $(GRP_SRCS) $(SCHED_SRCS)
CSRCS += $(TSK_SRCS) $(ERRNO_SRCS) $(WDOG_SRCS) $(SEM_SRCS)
CSRCS += $(SIGNAL_SRCS) $(PTHREAD_SRCS) $(MQUEUE_SRCS) $(CLOCK_SRCS)

8
sched/os_internal.h → sched/sched/sched.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* sched/os_internal.h
* sched/sched/sched.h
*
* Copyright (C) 2007-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __SCHED_OS_INTERNAL_H
#define __SCHED_OS_INTERNAL_H
#ifndef __SCHED_SCHED_SCHED_H
#define __SCHED_SCHED_SCHED_H
/****************************************************************************
* Included Files
@ -247,4 +247,4 @@ void weak_function sched_process_cpuload(void);
bool sched_verifytcb(FAR struct tcb_s *tcb);
int sched_releasetcb(FAR struct tcb_s *tcb, uint8_t ttype);
#endif /* __SCHED_OS_INTERNAL_H */
#endif /* __SCHED_SCHED_SCHED_H */

4
sched/sched_addblocked.c → sched/sched/sched_addblocked.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_addblocked.c
* sched/sched/sched_addblocked.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -42,7 +42,7 @@
#include <queue.h>
#include <assert.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Definitions

4
sched/sched_addprioritized.c → sched/sched/sched_addprioritized.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_addprioritized.c
* sched/sched/sched_addprioritized.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -44,7 +44,7 @@
#include <queue.h>
#include <assert.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Pre-processor Definitions

4
sched/sched_addreadytorun.c → sched/sched/sched_addreadytorun.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* sched/sched_addreadytorun.c
* sched/sched/sched_addreadytorun.c
*
* Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -43,7 +43,7 @@
#include <queue.h>
#include <assert.h>
#include "os_internal.h"
#include "sched/sched.h"
/****************************************************************************
* Pre-processor Definitions

4
sched/sched_cpuload.c → sched/sched/sched_cpuload.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_cpuload.c
* sched/sched/sched_cpuload.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +45,7 @@
#include <nuttx/clock.h>
#include <arch/irq.h>
#include "os_internal.h"
#include "sched/sched.h"
#ifdef CONFIG_SCHED_CPULOAD

4
sched/sched_foreach.c → sched/sched/sched_foreach.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_foreach.c
* sched/sched/sched_foreach.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -38,7 +38,7 @@
************************************************************************/
#include <sched.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Global Functions

4
sched/sched_free.c → sched/sched/sched_free.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_free.c
* sched/sched/sched_free.c
*
* Copyright (C) 2007, 2009, 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +45,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
#include <nuttx/wqueue.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Definitions

4
sched/sched_garbage.c → sched/sched/sched_garbage.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* sched/sched_garbage.c
* sched/sched/sched_garbage.c
*
* Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include <nuttx/kmalloc.h>
#include "os_internal.h"
#include "sched/sched.h"
/****************************************************************************
* Pre-processor Definitions

4
sched/sched_getfiles.c → sched/sched/sched_getfiles.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_getfiles.c
* sched/sched/sched_getfiles.c
*
* Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -39,7 +39,7 @@
#include <nuttx/config.h>
#include <sched.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Private Functions

4
sched/sched_getparam.c → sched/sched/sched_getparam.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_getparam.c
* sched/sched/sched_getparam.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -42,7 +42,7 @@
#include <sys/types.h>
#include <sched.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Definitions

4
sched/sched_getscheduler.c → sched/sched/sched_getscheduler.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_getscheduler.c
* sched/sched/sched_getscheduler.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +45,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Definitions

4
sched/sched_getsockets.c → sched/sched/sched_getsockets.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_getsockets.c
* sched/sched/sched_getsockets.c
*
* Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include <sched.h>
#include "os_internal.h"
#include "sched/sched.h"
#if CONFIG_NSOCKET_DESCRIPTORS > 0

4
sched/sched_getstreams.c → sched/sched/sched_getstreams.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* sched/sched_getstreams.c
* sched/sched/sched_getstreams.c
*
* Copyright (C) 2007, 2008, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -39,7 +39,7 @@
#include <nuttx/config.h>
#include <sched.h>
#include "os_internal.h"
#include "sched/sched.h"
/****************************************************************************
* Private Functions

4
sched/sched_gettcb.c → sched/sched/sched_gettcb.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* sched/sched_gettcb.c
* sched/sched/sched_gettcb.c
*
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -41,7 +41,7 @@
#include <sched.h>
#include "os_internal.h"
#include "sched/sched.h"
/****************************************************************************
* Definitions

4
sched/sched_lock.c → sched/sched/sched_lock.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_lock.c
* sched/sched/sched_lock.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -43,7 +43,7 @@
#include <assert.h>
#include <nuttx/arch.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Definitions

4
sched/sched_lockcount.c → sched/sched/sched_lockcount.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_lockcount.c
* sched/sched/sched_lockcount.c
*
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -41,7 +41,7 @@
#include <stdint.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Definitions

4
sched/sched_mergepending.c → sched/sched/sched_mergepending.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_mergepending.c
* sched/sched/sched_mergepending.c
*
* Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -44,7 +44,7 @@
#include <queue.h>
#include <assert.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Pre-processor Definitions

4
sched/sched_processtimer.c → sched/sched/sched_processtimer.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_processtimer.c
* sched/sched/sched_processtimer.c
*
* Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -46,7 +46,7 @@
# include <nuttx/arch.h>
#endif
#include "os_internal.h"
#include "sched/sched.h"
#include "wdog/wdog.h"
#include "clock/clock.h"

4
sched/sched_releasetcb.c → sched/sched/sched_releasetcb.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_releasetcb.c
* sched/sched/sched_releasetcb.c
*
* Copyright (C) 2007, 2009, 2012-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -44,7 +44,7 @@
#include <errno.h>
#include <nuttx/arch.h>
#include "os_internal.h"
#include "sched/sched.h"
#include "group/group.h"
#include "timer/timer.h"

4
sched/sched_removeblocked.c → sched/sched/sched_removeblocked.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_removeblocked.c
* sched/sched/sched_removeblocked.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -42,7 +42,7 @@
#include <queue.h>
#include <assert.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Definitions

2
sched/sched_removereadytorun.c → sched/sched/sched_removereadytorun.c
View File

@ -43,7 +43,7 @@
#include <queue.h>
#include <assert.h>
#include "os_internal.h"
#include "sched/sched.h"
/****************************************************************************
* Pre-processor Definitions

4
sched/sched_reprioritize.c → sched/sched/sched_reprioritize.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* sched/sched_reprioritize.c
* sched/sched/sched_reprioritize.c
*
* Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -43,7 +43,7 @@
#include <sched.h>
#include <errno.h>
#include "os_internal.h"
#include "sched/sched.h"
#ifdef CONFIG_PRIORITY_INHERITANCE

4
sched/sched_rrgetinterval.c → sched/sched/sched_rrgetinterval.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_rrgetinterval.c
* sched/sched/sched_rrgetinterval.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +45,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
#include "sched/sched.h"
#include "clock/clock.h"
/************************************************************************

4
sched/sched_self.c → sched/sched/sched_self.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* sched/sched_self.c
* sched/sched/sched_self.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -39,7 +39,7 @@
#include <sys/types.h>
#include <sched.h>
#include "os_internal.h"
#include "sched/sched.h"
/****************************************************************************
* Definitions

4
sched/sched_setparam.c → sched/sched/sched_setparam.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* sched/sched_setparam.c
* sched/sched/sched_setparam.c
*
* Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +45,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
#include "sched/sched.h"
/****************************************************************************
* Definitions

4
sched/sched_setpriority.c → sched/sched/sched_setpriority.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* sched/sched_setpriority.c
* sched/sched/sched_setpriority.c
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -44,7 +44,7 @@
#include <errno.h>
#include <nuttx/arch.h>
#include "os_internal.h"
#include "sched/sched.h"
/****************************************************************************
* Definitions

4
sched/sched_setscheduler.c → sched/sched/sched_setscheduler.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* sched/sched_setscheduler.c
* sched/sched/sched_setscheduler.c
*
* Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
#include "sched/sched.h"
#include "clock/clock.h"
/****************************************************************************

4
sched/sched_timerexpiration.c → sched/sched/sched_timerexpiration.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_timerexpiration.c
* sched/sched/sched_timerexpiration.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -49,7 +49,7 @@
# include <nuttx/arch.h>
#endif
#include "os_internal.h"
#include "sched/sched.h"
#include "wdog/wdog.h"
#include "clock/clock.h"

4
sched/sched_unlock.c → sched/sched/sched_unlock.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* sched/sched_unlock.c
* sched/sched/sched_unlock.c
*
* Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -42,7 +42,7 @@
#include <nuttx/clock.h>
#include <nuttx/arch.h>
#include "os_internal.h"
#include "sched/sched.h"
/************************************************************************
* Pre-processor Definitions

2
sched/sched_verifytcb.c → sched/sched/sched_verifytcb.c
View File

@ -42,7 +42,7 @@
#include <stdbool.h>
#include <sched.h>
#include "os_internal.h"
#include "sched/sched.h"
/****************************************************************************
* Definitions

4
sched/sched_wait.c → sched/sched/sched_wait.c
View File

@ -1,5 +1,5 @@
/*****************************************************************************
* sched/sched_wait.c
* sched/sched/sched_wait.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +45,7 @@
#include <nuttx/sched.h>
#include "os_internal.h"
#include "sched/sched.h"
#if defined(CONFIG_SCHED_WAITPID) && defined(CONFIG_SCHED_HAVE_PARENT)

4
sched/sched_waitid.c → sched/sched/sched_waitid.c
View File

@ -1,5 +1,5 @@
/*****************************************************************************
* sched/sched_waitid.c
* sched/sched/sched_waitid.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +45,7 @@
#include <nuttx/sched.h>
#include "os_internal.h"
#include "sched/sched.h"
#include "group/group.h"
#if defined(CONFIG_SCHED_WAITPID) && defined(CONFIG_SCHED_HAVE_PARENT)

4
sched/sched_waitpid.c → sched/sched/sched_waitpid.c
View File

@ -1,5 +1,5 @@
/*****************************************************************************
* sched/sched_waitpid.c
* sched/sched/sched_waitpid.c
*
* Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -46,7 +46,7 @@
#include <nuttx/sched.h>
#include "os_internal.h"
#include "sched/sched.h"
#include "group/group.h"
#ifdef CONFIG_SCHED_WAITPID

4
sched/sched_yield.c → sched/sched/sched_yield.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* sched/sched_yield.c
* sched/sched/sched_yield.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -41,7 +41,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
#include "sched/sched.h"
/****************************************************************************
* Definitions