From 5baa738019acb0f08215b86033e879942829b410 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 23 Jul 2015 14:36:49 -0600 Subject: [PATCH] Most cosmetic, but includes some fixes to some range checking --- libc/pthread/pthread_attrsetschedparam.c | 4 +++ libc/sched/sched_getprioritymax.c | 38 ++++-------------------- libc/sched/sched_getprioritymin.c | 38 ++++-------------------- libc/spawn/lib_psa_setschedparam.c | 2 +- sched/pthread/pthread_create.c | 11 ++----- sched/sched/sched_setparam.c | 24 --------------- sched/sched/sched_setscheduler.c | 24 --------------- sched/task/task_spawnparms.c | 10 +------ 8 files changed, 18 insertions(+), 133 deletions(-) diff --git a/libc/pthread/pthread_attrsetschedparam.c b/libc/pthread/pthread_attrsetschedparam.c index 0a06f1b926..70fcd11272 100644 --- a/libc/pthread/pthread_attrsetschedparam.c +++ b/libc/pthread/pthread_attrsetschedparam.c @@ -45,6 +45,10 @@ #include #include +/**************************************************************************** + * Public Functions + ****************************************************************************/ + /**************************************************************************** * Function: pthread_attr_setschedparam * diff --git a/libc/sched/sched_getprioritymax.c b/libc/sched/sched_getprioritymax.c index fd3fdd490b..e65c25d603 100644 --- a/libc/sched/sched_getprioritymax.c +++ b/libc/sched/sched_getprioritymax.c @@ -1,7 +1,7 @@ /************************************************************************ * libc/sched/sched_getprioritymax.c * - * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009, 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -39,32 +39,10 @@ #include +#include + #include -/************************************************************************ - * Pre-processor Definitions - ************************************************************************/ - -/************************************************************************ - * Private Type Declarations - ************************************************************************/ - -/************************************************************************ - * Global Variables - ************************************************************************/ - -/************************************************************************ - * Private Variables - ************************************************************************/ - -/************************************************************************ - * Private Function Prototypes - ************************************************************************/ - -/************************************************************************ - * Private Functions - ************************************************************************/ - /************************************************************************ * Public Functions ************************************************************************/ @@ -89,12 +67,6 @@ int sched_get_priority_max(int policy) { - if (policy != SCHED_FIFO && policy != SCHED_RR) - { - return ERROR; - } - else - { - return SCHED_PRIORITY_MAX; - } + DEBUGASSERT(policy >= SCHED_FIFO && policy <= SCHED_OTHER); + return SCHED_PRIORITY_MAX; } diff --git a/libc/sched/sched_getprioritymin.c b/libc/sched/sched_getprioritymin.c index 27156b6558..23a06f5d3b 100644 --- a/libc/sched/sched_getprioritymin.c +++ b/libc/sched/sched_getprioritymin.c @@ -1,7 +1,7 @@ /************************************************************************ * libc/sched/sched_getprioritymin.c * - * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009, 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -39,32 +39,10 @@ #include +#include + #include -/************************************************************************ - * Pre-processor Definitions - ************************************************************************/ - -/************************************************************************ - * Private Type Declarations - ************************************************************************/ - -/************************************************************************ - * Global Variables - ************************************************************************/ - -/************************************************************************ - * Private Variables - ************************************************************************/ - -/************************************************************************ - * Private Function Prototypes - ************************************************************************/ - -/************************************************************************ - * Private Functions - ************************************************************************/ - /************************************************************************ * Public Functions ************************************************************************/ @@ -89,12 +67,6 @@ int sched_get_priority_min(int policy) { - if (policy != SCHED_FIFO && policy != SCHED_RR) - { - return ERROR; - } - else - { - return SCHED_PRIORITY_MIN; - } + DEBUGASSERT(policy >= SCHED_FIFO && policy <= SCHED_OTHER); + return SCHED_PRIORITY_MIN; } diff --git a/libc/spawn/lib_psa_setschedparam.c b/libc/spawn/lib_psa_setschedparam.c index 3e29ca4937..41c0366e0f 100644 --- a/libc/spawn/lib_psa_setschedparam.c +++ b/libc/spawn/lib_psa_setschedparam.c @@ -44,7 +44,7 @@ #include /**************************************************************************** - * Global Functions + * Public Functions ****************************************************************************/ /**************************************************************************** diff --git a/sched/pthread/pthread_create.c b/sched/pthread/pthread_create.c index efd9d10eed..86e3dd8d8d 100644 --- a/sched/pthread/pthread_create.c +++ b/sched/pthread/pthread_create.c @@ -58,16 +58,9 @@ #include "pthread/pthread.h" /**************************************************************************** - * Pre-processor Definitions + * Public Data ****************************************************************************/ -/**************************************************************************** - * Private Type Declarations - ****************************************************************************/ - -/**************************************************************************** - * Global Variables - ****************************************************************************/ /* Default pthread attributes (see include/nuttx/pthread.h). When configured * to build separate kernel- and user-address spaces, this global is * duplicated in each address spaced. This copy can only be shared within @@ -77,7 +70,7 @@ const pthread_attr_t g_default_pthread_attr = PTHREAD_ATTR_INITIALIZER; /**************************************************************************** - * Private Variables + * Private Data ****************************************************************************/ /* This is the name for name-less pthreads */ diff --git a/sched/sched/sched_setparam.c b/sched/sched/sched_setparam.c index 5ba08d3c97..e75980c3b5 100644 --- a/sched/sched/sched_setparam.c +++ b/sched/sched/sched_setparam.c @@ -48,30 +48,6 @@ #include "clock/clock.h" #include "sched/sched.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Type Declarations - ****************************************************************************/ - -/**************************************************************************** - * Global Variables - ****************************************************************************/ - -/**************************************************************************** - * Private Variables - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/sched/sched/sched_setscheduler.c b/sched/sched/sched_setscheduler.c index 8849a426a9..f05fb39bc7 100644 --- a/sched/sched/sched_setscheduler.c +++ b/sched/sched/sched_setscheduler.c @@ -49,30 +49,6 @@ #include "sched/sched.h" #include "clock/clock.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Type Declarations - ****************************************************************************/ - -/**************************************************************************** - * Global Variables - ****************************************************************************/ - -/**************************************************************************** - * Private Variables - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/sched/task/task_spawnparms.c b/sched/task/task_spawnparms.c index 32be77bd36..8e1b0318fb 100644 --- a/sched/task/task_spawnparms.c +++ b/sched/task/task_spawnparms.c @@ -49,10 +49,6 @@ #include "task/spawn.h" #include "task/task.h" -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Public Data ****************************************************************************/ @@ -63,10 +59,6 @@ sem_t g_spawn_execsem = SEM_INITIALIZER(0); #endif struct spawn_parms_s g_spawn_parms; -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -310,7 +302,7 @@ int spawn_execattrs(pid_t pid, FAR const posix_spawnattr_t *attr) * file_actions - The attributes to use * * Returned Value: - * 0 (OK) on successed; A negated errno value is returned on failure. + * 0 (OK) on success; A negated errno value is returned on failure. * ****************************************************************************/