diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-03-23 20:14:21 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-03-23 20:14:21 +0000 |
commit | 3e42396a44aaaf963829e9291c703162c3a09bfe (patch) | |
tree | cff1dab1c7daaf9d6ba4d5aceaf5512e386bccf1 /nuttx/sched | |
parent | 72dfc599ee8982c845eaec8b8ed9d07b0faa182c (diff) | |
download | px4-firmware-3e42396a44aaaf963829e9291c703162c3a09bfe.tar.gz px4-firmware-3e42396a44aaaf963829e9291c703162c3a09bfe.tar.bz2 px4-firmware-3e42396a44aaaf963829e9291c703162c3a09bfe.zip |
Updated comments; starting to implement priority protection but backed everything out but some changes to comments
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4510 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/sched')
-rw-r--r-- | nuttx/sched/os_internal.h | 2 | ||||
-rw-r--r-- | nuttx/sched/sched_reprioritize.c | 4 | ||||
-rw-r--r-- | nuttx/sched/sem_initialize.c | 4 | ||||
-rw-r--r-- | nuttx/sched/sem_internal.h | 10 | ||||
-rw-r--r-- | nuttx/sched/sem_post.c | 4 | ||||
-rw-r--r-- | nuttx/sched/sem_wait.c | 4 | ||||
-rw-r--r-- | nuttx/sched/task_restart.c | 9 | ||||
-rw-r--r-- | nuttx/sched/task_setup.c | 4 |
8 files changed, 25 insertions, 16 deletions
diff --git a/nuttx/sched/os_internal.h b/nuttx/sched/os_internal.h index 16eb176e1..b7376eb1e 100644 --- a/nuttx/sched/os_internal.h +++ b/nuttx/sched/os_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * sched/os_internal.h * - * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without diff --git a/nuttx/sched/sched_reprioritize.c b/nuttx/sched/sched_reprioritize.c index 9c40e5e3d..3fa1c4da0 100644 --- a/nuttx/sched/sched_reprioritize.c +++ b/nuttx/sched/sched_reprioritize.c @@ -1,8 +1,8 @@ /**************************************************************************** * sched/sched_reprioritize.c * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/sched/sem_initialize.c b/nuttx/sched/sem_initialize.c index a355571fd..e9ebfb737 100644 --- a/nuttx/sched/sem_initialize.c +++ b/nuttx/sched/sem_initialize.c @@ -1,8 +1,8 @@ /**************************************************************************** * schec/sem_initialize.c * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/sched/sem_internal.h b/nuttx/sched/sem_internal.h index b67e506bf..4688e0cae 100644 --- a/nuttx/sched/sem_internal.h +++ b/nuttx/sched/sem_internal.h @@ -1,8 +1,8 @@ /**************************************************************************** * sched/sem_internal.h * - * Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007, 2009-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -89,10 +89,16 @@ extern "C" { #define EXTERN extern #endif +/* Common semaphore logic */ + EXTERN void weak_function sem_initialize(void); EXTERN void sem_waitirq(FAR _TCB *wtcb, int errcode); EXTERN FAR nsem_t *sem_findnamed(const char *name); +/* Special logic needed only by priority inheritance to manage collections of + * holders of semaphores. + */ + #ifdef CONFIG_PRIORITY_INHERITANCE EXTERN void sem_initholders(void); EXTERN void sem_destroyholder(FAR sem_t *sem); diff --git a/nuttx/sched/sem_post.c b/nuttx/sched/sem_post.c index b29cdfb15..183ca362a 100644 --- a/nuttx/sched/sem_post.c +++ b/nuttx/sched/sem_post.c @@ -1,8 +1,8 @@ /**************************************************************************** * sched/sem_post.c * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/sched/sem_wait.c b/nuttx/sched/sem_wait.c index e36de438d..98097c991 100644 --- a/nuttx/sched/sem_wait.c +++ b/nuttx/sched/sem_wait.c @@ -1,8 +1,8 @@ /**************************************************************************** * sched/sem_wait.c * - * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/sched/task_restart.c b/nuttx/sched/task_restart.c index 1cd575a4e..c70a2e945 100644 --- a/nuttx/sched/task_restart.c +++ b/nuttx/sched/task_restart.c @@ -1,8 +1,8 @@ /**************************************************************************** * sched/task_restart.c * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -146,9 +146,12 @@ int task_restart(pid_t pid) sig_cleanup(tcb); /* Deallocate Signal lists */ - /* Reset the task priority */ + /* Reset the current task priority */ tcb->sched_priority = tcb->init_priority; + + /* Reset the base task priority and the number of pending reprioritizations */ + #ifdef CONFIG_PRIORITY_INHERITANCE tcb->base_priority = tcb->init_priority; # if CONFIG_SEM_NNESTPRIO > 0 diff --git a/nuttx/sched/task_setup.c b/nuttx/sched/task_setup.c index 9fdbf3d25..2cbd6daba 100644 --- a/nuttx/sched/task_setup.c +++ b/nuttx/sched/task_setup.c @@ -1,8 +1,8 @@ /**************************************************************************** * sched/task_setup.c * - * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |