3 files changed, 61 insertions, 15 deletions

diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c
index 5988a5e772..f432b1ba53 100644
--- a/cpukit/posix/src/pthread.c
+++ b/cpukit/posix/src/pthread.c
@@ -17,10 +17,12 @@
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <stdio.h>
 
 #include <errno.h>
 #include <pthread.h>
 #include <limits.h>
+#include <assert.h>
 
 #include <rtems/system.h>
 #include <rtems/config.h>
@@ -46,13 +48,14 @@
  *  NOTE: Be careful .. if the default attribute set changes,
  *        _POSIX_Threads_Initialize_user_threads will need to be examined.
  */
-const pthread_attr_t _POSIX_Threads_Default_attributes = {
-  true,                       /* is_initialized */
-  NULL,                       /* stackaddr */
-  0,                          /* stacksize -- will be adjusted to minimum */
-  PTHREAD_SCOPE_PROCESS,      /* contentionscope */
-  PTHREAD_INHERIT_SCHED,      /* inheritsched */
-  SCHED_FIFO,                 /* schedpolicy */
+pthread_attr_t _POSIX_Threads_Default_attributes = {
+  .is_initialized  = true,                       /* is_initialized */
+  .stackaddr       = NULL,                       /* stackaddr */
+  .stacksize       = 0,                          /* stacksize -- will be adjusted to minimum */
+  .contentionscope = PTHREAD_SCOPE_PROCESS,      /* contentionscope */
+  .inheritsched    = PTHREAD_INHERIT_SCHED,      /* inheritsched */
+  .schedpolicy     = SCHED_FIFO,                 /* schedpolicy */
+  .schedparam      =
   {                           /* schedparam */
     2,                        /* sched_priority */
     #if defined(_POSIX_SPORADIC_SERVER) || \
@@ -63,13 +66,19 @@ const pthread_attr_t _POSIX_Threads_Default_attributes = {
       0                         /* sched_ss_max_repl */
     #endif
   },
+
   #if HAVE_DECL_PTHREAD_ATTR_SETGUARDSIZE
-    0,                        /* guardsize */
+    .guardsize = 0,                            /* guardsize */
   #endif
   #if defined(_POSIX_THREAD_CPUTIME)
-    1,                        /* cputime_clock_allowed */
+    .cputime_clock_allowed = 1,                        /* cputime_clock_allowed */
+  #endif
+  .detachstate             = PTHREAD_CREATE_JOINABLE,    /* detachstate */
+  #if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
+    .affinitysetsize         = 0,
+    .affinityset             = NULL,
+    .affinitysetpreallocated = {{0x0}}
   #endif
-  PTHREAD_CREATE_JOINABLE,    /* detachstate */
 };
 
 /*
@@ -187,7 +196,7 @@ static bool _POSIX_Threads_Create_extension(
   created->API_Extensions[ THREAD_API_POSIX ] = api;
 
   /* XXX check all fields are touched */
-  api->Attributes  = _POSIX_Threads_Default_attributes;
+  _POSIX_Threads_Initialize_attributes( &api->Attributes );
   api->detachstate = _POSIX_Threads_Default_attributes.detachstate;
   api->schedpolicy = _POSIX_Threads_Default_attributes.schedpolicy;
   api->schedparam  = _POSIX_Threads_Default_attributes.schedparam;
@@ -346,6 +355,27 @@ User_extensions_Control _POSIX_Threads_User_extensions = {
  */
 void _POSIX_Threads_Manager_initialization(void)
 {
+  #if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
+    pthread_attr_t *attr;
+    int i;
+    int max_cpus = 1;
+
+    /* Initialize default attribute. */
+    attr = &_POSIX_Threads_Default_attributes;
+
+    /* We do not support a cpu count over CPU_SETSIZE  */
+    max_cpus = _SMP_Get_processor_count();
+    assert( max_cpus <= CPU_SETSIZE );
+
+    /*  Initialize the affinity to be the set of all available CPU's   */
+    attr->affinityset             = &attr->affinitysetpreallocated;
+    attr->affinitysetsize         = sizeof( *attr->affinityset );
+    CPU_ZERO_S( attr->affinitysetsize, &attr->affinitysetpreallocated );
+
+    for (i=0; i<max_cpus; i++)  
+      CPU_SET_S(i, attr->affinitysetsize, attr->affinityset );
+  #endif
+
   _Objects_Initialize_information(
     &_POSIX_Threads_Information, /* object information table */
     OBJECTS_POSIX_API,           /* object API */
diff --git a/cpukit/posix/src/pthreadattrinit.c b/cpukit/posix/src/pthreadattrinit.c
index cf0ecabfe9..3dc66449f9 100644
--- a/cpukit/posix/src/pthreadattrinit.c
+++ b/cpukit/posix/src/pthreadattrinit.c
@@ -34,6 +34,7 @@ int pthread_attr_init(
   if ( !attr )
     return EINVAL;
 
-  *attr = _POSIX_Threads_Default_attributes;
-   return 0;
+  _POSIX_Threads_Initialize_attributes( attr );
+
+  return 0;
 }
diff --git a/cpukit/posix/src/pthreadcreate.c b/cpukit/posix/src/pthreadcreate.c
index b780eccfe9..b1483726e0 100644
--- a/cpukit/posix/src/pthreadcreate.c
+++ b/cpukit/posix/src/pthreadcreate.c
@@ -27,6 +27,7 @@
 #include <rtems/posix/priorityimpl.h>
 #include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/time.h>
+#include <rtems/score/cpusetimpl.h>
 #include <rtems/score/threadimpl.h>
 #include <rtems/score/apimutex.h>
 #include <rtems/score/stackimpl.h>
@@ -136,6 +137,14 @@ int pthread_create(
   if ( rc )
     return rc;
 
+#if defined(RTEMS_SMP)
+#if __RTEMS_HAVE_SYS_CPUSET_H__
+  rc = _CPU_set_Is_valid( attr->affinityset, attr->affinitysetsize );
+  if ( rc != 0 )
+    return EINVAL;
+#endif
+#endif
+
   /*
    *  Currently all POSIX threads are floating point if the hardware
    *  supports it.
@@ -179,19 +188,25 @@ int pthread_create(
     0,                    /* isr level */
     name                  /* posix threads don't have a name */
   );
-
   if ( !status ) {
     _POSIX_Threads_Free( the_thread );
     _RTEMS_Unlock_allocator();
     return EAGAIN;
   }
 
+#if defined(RTEMS_SMP)
+#if __RTEMS_HAVE_SYS_CPUSET_H__
+   the_thread->affinity.setsize   = attr->affinitysetsize;
+   *the_thread->affinity.set      = *attr->affinityset;
+#endif
+#endif
+
   /*
    *  finish initializing the per API structure
    */
   api = the_thread->API_Extensions[ THREAD_API_POSIX ];
 
-  api->Attributes  = *the_attr;
+  _POSIX_Threads_Copy_attributes( &api->Attributes, the_attr );
   api->detachstate = the_attr->detachstate;
   api->schedpolicy = schedpolicy;
   api->schedparam  = schedparam;