Move all pthread files from sched/ to sched/pthread

2014-08-08 12:55:02 -06:00 · 2014-08-08 12:55:02 -06:00 · cb79407ced
commit cb79407ced
parent 0385a00a60
61 changed files with 57 additions and 85 deletions
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@ -290,7 +290,7 @@ struct dspace_s

 #ifndef CONFIG_DISABLE_PTHREAD
 struct join_s;                      /* Forward reference                        */
-                                    /* Defined in pthread_internal.h            */
+                                    /* Defined in sched/pthread/pthread.h       */
 #endif

 struct task_group_s
--- a/sched/Makefile
+++ b/sched/Makefile
@ -136,31 +136,6 @@ CLOCK_SRCS  = clock_initialize.c clock_settime.c clock_gettime.c clock_getres.c
 CLOCK_SRCS += clock_time2ticks.c clock_abstime2ticks.c clock_ticks2time.c
 CLOCK_SRCS += clock_gettimeofday.c clock_systimer.c

-SIGNAL_SRCS  = sig_initialize.c
-SIGNAL_SRCS += sig_action.c sig_procmask.c sig_pending.c sig_suspend.c
-SIGNAL_SRCS += sig_kill.c sig_queue.c sig_waitinfo.c sig_timedwait.c
-SIGNAL_SRCS += sig_findaction.c sig_allocatependingsigaction.c
-SIGNAL_SRCS += sig_releasependingsigaction.c sig_unmaskpendingsignal.c
-SIGNAL_SRCS += sig_removependingsignal.c sig_releasependingsignal.c sig_lowest.c
-SIGNAL_SRCS += sig_mqnotempty.c sig_cleanup.c sig_dispatch.c sig_deliver.c
-SIGNAL_SRCS += pause.c
-
-PTHREAD_SRCS  = pthread_create.c pthread_exit.c pthread_join.c pthread_detach.c
-PTHREAD_SRCS += pthread_yield.c pthread_getschedparam.c pthread_setschedparam.c
-PTHREAD_SRCS += pthread_mutexinit.c pthread_mutexdestroy.c
-PTHREAD_SRCS += pthread_mutexlock.c pthread_mutextrylock.c pthread_mutexunlock.c
-PTHREAD_SRCS += pthread_condinit.c pthread_conddestroy.c
-PTHREAD_SRCS += pthread_condwait.c pthread_condsignal.c pthread_condbroadcast.c
-PTHREAD_SRCS += pthread_barrierinit.c pthread_barrierdestroy.c pthread_barrierwait.c
-PTHREAD_SRCS += pthread_cancel.c pthread_setcancelstate.c
-PTHREAD_SRCS += pthread_keycreate.c pthread_setspecific.c pthread_getspecific.c pthread_keydelete.c
-PTHREAD_SRCS += pthread_initialize.c pthread_completejoin.c pthread_findjoininfo.c
-PTHREAD_SRCS += pthread_once.c pthread_release.c pthread_setschedprio.c
-
-ifneq ($(CONFIG_DISABLE_SIGNALS),y)
-PTHREAD_SRCS += pthread_condtimedwait.c pthread_kill.c pthread_sigmask.c
-endif
-
 SEM_SRCS  = sem_initialize.c sem_destroy.c sem_open.c sem_close.c sem_unlink.c
 SEM_SRCS += sem_wait.c sem_trywait.c sem_timedwait.c sem_post.c sem_findnamed.c

@ -184,15 +159,12 @@ endif
 IRQ_SRCS = irq_initialize.c irq_attach.c irq_dispatch.c irq_unexpectedisr.c

 include signal/Make.defs
+include pthread/Make.defs
 include mqueue/Make.defs

 CSRCS  = $(MISC_SRCS) $(TSK_SRCS) $(GRP_SRCS) $(SCHED_SRCS) $(WDOG_SRCS)
 CSRCS += $(TIME_SRCS) $(SEM_SRCS) $(TIMER_SRCS) $(PGFILL_SRCS)
-CSRCS += $(IRQ_SRCS) $(CLOCK_SRCS) $(MQUEUE_SRCS) $(SIGNAL_SRCS)
-
-ifneq ($(CONFIG_DISABLE_PTHREAD),y)
-CSRCS += $(PTHREAD_SRCS)
-endif
+CSRCS += $(IRQ_SRCS) $(CLOCK_SRCS) $(MQUEUE_SRCS) $(SIGNAL_SRCS) $(PTHREAD_SRCS)

 ifneq ($(CONFIG_DISABLE_ENVIRON),y)
 CSRCS += $(ENV_SRCS)
--- a/sched/group_leave.c
+++ b/sched/group_leave.c
@ -50,7 +50,7 @@

 #include "env_internal.h"
 #include "signal/signal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 #include "mqueue/mqueue.h"
 #include "group_internal.h"

--- a/sched/os_start.c
+++ b/sched/os_start.c
@ -59,7 +59,7 @@
 # include "mqueue/mqueue.h"
 #endif
 #ifndef CONFIG_DISABLE_PTHREAD
-# include "pthread_internal.h"
+# include "pthread/pthread.h"
 #endif
 #include  "clock_internal.h"
 #include  "timer_internal.h"
--- a/sched/pthread_internal.h
+++ b/sched/pthread_internal.h
@ -1,7 +1,7 @@
 /****************************************************************************
- * sched/pthread_internal.h
+ * sched/pthread/pthread.h
 *
- *   Copyright (C) 2007-2009, 2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011, 2013-2014 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
 *
 * Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __SCHED_PTHREAD_INTERNAL_H
-#define __SCHED_PTHREAD_INTERNAL_H
+#ifndef __SCHED_PTHREAD_PTHREAD_H
+#define __SCHED_PTHREAD_PTHREAD_H

 /****************************************************************************
 * Included Files
@ -118,5 +118,5 @@ int pthread_mutexattr_verifytype(int type);
 }
 #endif

-#endif /* __SCHED_PTHREAD_INTERNAL_H */
+#endif /* __SCHED_PTHREAD_PTHREAD_H */

--- a/sched/pthread/pthread_barrierdestroy.c
+++ b/sched/pthread/pthread_barrierdestroy.c
--- a/sched/pthread/pthread_barrierinit.c
+++ b/sched/pthread/pthread_barrierinit.c
--- a/sched/pthread/pthread_barrierwait.c
+++ b/sched/pthread/pthread_barrierwait.c
--- a/sched/pthread/pthread_cancel.c
+++ b/sched/pthread/pthread_cancel.c
@ -45,7 +45,7 @@
 #include <errno.h>

 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /**************************************************************************
 * Private Definitions
--- a/sched/pthread/pthread_completejoin.c
+++ b/sched/pthread/pthread_completejoin.c
@ -47,7 +47,7 @@

 #include "os_internal.h"
 #include "group_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /************************************************************************
 * Pre-processor Definitions
--- a/sched/pthread/pthread_condbroadcast.c
+++ b/sched/pthread/pthread_condbroadcast.c
@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_conddestroy.c
+++ b/sched/pthread/pthread_conddestroy.c
@ -42,7 +42,7 @@
 #include <pthread.h>
 #include <debug.h>
 #include <errno.h>
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Global Functions
--- a/sched/pthread/pthread_condinit.c
+++ b/sched/pthread/pthread_condinit.c
@ -43,7 +43,7 @@
 #include <debug.h>
 #include <errno.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Global Functions
--- a/sched/pthread/pthread_condsignal.c
+++ b/sched/pthread/pthread_condsignal.c
@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_condtimedwait.c
+++ b/sched/pthread/pthread_condtimedwait.c
@ -51,7 +51,7 @@
 #include <debug.h>

 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 #include "clock_internal.h"
 #include "signal/signal.h"

--- a/sched/pthread/pthread_condwait.c
+++ b/sched/pthread/pthread_condwait.c
@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_create.c
+++ b/sched/pthread/pthread_create.c
@ -55,7 +55,7 @@
 #include "os_internal.h"
 #include "group_internal.h"
 #include "clock_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/sched/pthread/pthread_detach.c
+++ b/sched/pthread/pthread_detach.c
@ -48,7 +48,7 @@

 #include "os_internal.h"
 #include "group_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /************************************************************************
 * Pre-processor Definitions
--- a/sched/pthread/pthread_exit.c
+++ b/sched/pthread/pthread_exit.c
@ -50,7 +50,7 @@
 #include <nuttx/arch.h>

 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /************************************************************************
 * Definitions
--- a/sched/pthread/pthread_findjoininfo.c
+++ b/sched/pthread/pthread_findjoininfo.c
@ -42,7 +42,7 @@
 #include <sys/types.h>

 #include "group_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /************************************************************************
 * Definitions
--- a/sched/pthread/pthread_getschedparam.c
+++ b/sched/pthread/pthread_getschedparam.c
@ -42,7 +42,7 @@
 #include <sched.h>
 #include <errno.h>
 #include <debug.h>
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_getspecific.c
+++ b/sched/pthread/pthread_getspecific.c
@ -45,7 +45,7 @@
 #include <debug.h>

 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /************************************************************************
 * Definitions
--- a/sched/pthread/pthread_initialize.c
+++ b/sched/pthread/pthread_initialize.c
@ -43,7 +43,7 @@
 #include <semaphore.h>
 #include <errno.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_join.c
+++ b/sched/pthread/pthread_join.c
@ -45,7 +45,7 @@

 #include "os_internal.h"
 #include "group_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/sched/pthread/pthread_keycreate.c
+++ b/sched/pthread/pthread_keycreate.c
@ -45,7 +45,7 @@
 #include <debug.h>

 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_keydelete.c
+++ b/sched/pthread/pthread_keydelete.c
@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /************************************************************************
 * Definitions
--- a/sched/pthread/pthread_kill.c
+++ b/sched/pthread/pthread_kill.c
--- a/sched/pthread/pthread_mutexdestroy.c
+++ b/sched/pthread/pthread_mutexdestroy.c
@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_mutexinit.c
+++ b/sched/pthread/pthread_mutexinit.c
@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_mutexlock.c
+++ b/sched/pthread/pthread_mutexlock.c
@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_mutextrylock.c
+++ b/sched/pthread/pthread_mutextrylock.c
@ -46,7 +46,7 @@
 #include <errno.h>
 #include <debug.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_mutexunlock.c
+++ b/sched/pthread/pthread_mutexunlock.c
@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_once.c
+++ b/sched/pthread/pthread_once.c
--- a/sched/pthread/pthread_release.c
+++ b/sched/pthread/pthread_release.c
@ -43,7 +43,7 @@
 #include <debug.h>

 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /************************************************************************
 * Definitions
--- a/sched/pthread/pthread_setcancelstate.c
+++ b/sched/pthread/pthread_setcancelstate.c
--- a/sched/pthread/pthread_setschedparam.c
+++ b/sched/pthread/pthread_setschedparam.c
@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>

-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_setschedprio.c
+++ b/sched/pthread/pthread_setschedprio.c
--- a/sched/pthread/pthread_setspecific.c
+++ b/sched/pthread/pthread_setspecific.c
@ -45,7 +45,7 @@
 #include <debug.h>

 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"

 /****************************************************************************
 * Definitions
--- a/sched/pthread/pthread_sigmask.c
+++ b/sched/pthread/pthread_sigmask.c
--- a/sched/pthread/pthread_yield.c
+++ b/sched/pthread/pthread_yield.c
--- a/sched/signal/sig_action.c
+++ b/sched/signal/sig_action.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_action.c
+ * sched/signal/sig_action.c
 *
 *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_allocatependingsigaction.c
+++ b/sched/signal/sig_allocatependingsigaction.c
@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_allocatependingsigaction.c
+ * sched/signal/sig_allocatependingsigaction.c
 *
 *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_cleanup.c
+++ b/sched/signal/sig_cleanup.c
@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_cleanup.c
+ * sched/signal/sig_cleanup.c
 *
 *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_deliver.c
+++ b/sched/signal/sig_deliver.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_deliver.c
+ * sched/signal/sig_deliver.c
 *
 *   Copyright (C) 2007, 2008, 2012-2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_dispatch.c
+++ b/sched/signal/sig_dispatch.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_dispatch.c
+ * sched/signal/sig_dispatch.c
 *
 *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_findaction.c
+++ b/sched/signal/sig_findaction.c
@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_findaction.c
+ * sched/signal/sig_findaction.c
 *
 *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_initialize.c
+++ b/sched/signal/sig_initialize.c
@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_initialize.c
+ * sched/signal/sig_initialize.c
 *
 *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_kill.c
+++ b/sched/signal/sig_kill.c
@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_kill.c
+ * sched/signal/sig_kill.c
 *
 *   Copyright (C) 2007, 2009, 2011, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_lowest.c
+++ b/sched/signal/sig_lowest.c
@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_lowest.c
+ * sched/signal/sig_lowest.c
 *
 *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_mqnotempty.c
+++ b/sched/signal/sig_mqnotempty.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_mqnotempty.c
+ * sched/signal/sig_mqnotempty.c
 *
 *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_pending.c
+++ b/sched/signal/sig_pending.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_pending.c
+ * sched/signal/sig_pending.c
 *
 *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_procmask.c
+++ b/sched/signal/sig_procmask.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_procmask.c
+ * sched/signal/sig_procmask.c
 *
 *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_queue.c
+++ b/sched/signal/sig_queue.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_queue.c
+ * sched/signal/sig_queue.c
 *
 *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_releasependingsigaction.c
+++ b/sched/signal/sig_releasependingsigaction.c
@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_releasependingsigaction.c
+ * sched/signal/sig_releasependingsigaction.c
 *
 *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_releasependingsignal.c
+++ b/sched/signal/sig_releasependingsignal.c
@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_releasependingsignal.c
+ * sched/signal/sig_releasependingsignal.c
 *
 *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_removependingsignal.c
+++ b/sched/signal/sig_removependingsignal.c
@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_removependingsignal.c
+ * sched/signal/sig_removependingsignal.c
 *
 *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_suspend.c
+++ b/sched/signal/sig_suspend.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_suspend.c
+ * sched/signal/sig_suspend.c
 *
 *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_timedwait.c
+++ b/sched/signal/sig_timedwait.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_timedwait.c
+ * sched/signal/sig_timedwait.c
 *
 *   Copyright (C) 2007-2009, 2012-2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_unmaskpendingsignal.c
+++ b/sched/signal/sig_unmaskpendingsignal.c
@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_unmaskpendingsignal.c
+ * sched/signal/sig_unmaskpendingsignal.c
 *
 *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/signal/sig_waitinfo.c
+++ b/sched/signal/sig_waitinfo.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_waitinfo.c
+ * sched/signal/sig_waitinfo.c
 *
 *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/sched/task_setup.c
+++ b/sched/task_setup.c
@ -49,7 +49,7 @@
 #include <nuttx/arch.h>

 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 #include "group_internal.h"

 /****************************************************************************