summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJennifer Averett <jennifer.averett@oarcorp.com>2014-03-07 09:06:57 -0600
committerJennifer Averett <jennifer.averett@oarcorp.com>2014-03-07 09:15:15 -0600
commit5c3323492ecd894753efa5abed433655a8181c83 (patch)
treef2b6145882a261e35a6e9b4198235e3db0895c70 /cpukit
parentsmptests: Add smppsxaffinity02. (diff)
downloadrtems-5c3323492ecd894753efa5abed433655a8181c83.tar.bz2
Remove trailing whitespace in previous patches
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/posix/Makefile.am4
-rw-r--r--cpukit/posix/include/rtems/posix/pthreadimpl.h20
-rw-r--r--cpukit/posix/src/pthread.c2
-rw-r--r--cpukit/posix/src/pthreadattrcompare.c14
-rw-r--r--cpukit/posix/src/pthreadattrsetaffinitynp.c2
-rw-r--r--cpukit/posix/src/pthreadgetaffinitynp.c2
-rw-r--r--cpukit/posix/src/pthreadsetaffinitynp.c2
-rw-r--r--cpukit/rtems/include/rtems/rtems/tasks.h22
-rw-r--r--cpukit/rtems/src/taskgetaffinity.c2
-rw-r--r--cpukit/rtems/src/tasksetaffinity.c2
-rw-r--r--cpukit/score/include/rtems/score/cpuset.h6
-rw-r--r--cpukit/score/include/rtems/score/thread.h2
-rw-r--r--cpukit/score/src/cpuset.c4
-rw-r--r--cpukit/score/src/cpusetprintsupport.c6
14 files changed, 45 insertions, 45 deletions
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index ccadd63630..f9eeef2a43 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -141,10 +141,10 @@ libposix_a_SOURCES += src/pthreadatfork.c src/pthreadattrdestroy.c \
src/psxpriorityisvalid.c src/psxtransschedparam.c
## RTEMS specific support methods
-libposix_a_SOURCES += src/pthreadattrcompare.c
+libposix_a_SOURCES += src/pthreadattrcompare.c
if HAS_SMP
-## PTHREAD_AFFINITY_C_FILES
+## PTHREAD_AFFINITY_C_FILES
libposix_a_SOURCES += src/pthreadattrsetaffinitynp.c \
src/pthreadattrgetaffinitynp.c src/pthreadgetaffinitynp.c \
src/pthreadsetaffinitynp.c
diff --git a/cpukit/posix/include/rtems/posix/pthreadimpl.h b/cpukit/posix/include/rtems/posix/pthreadimpl.h
index c4ace76d0e..ddee9c920b 100644
--- a/cpukit/posix/include/rtems/posix/pthreadimpl.h
+++ b/cpukit/posix/include/rtems/posix/pthreadimpl.h
@@ -89,7 +89,7 @@ RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Allocate( void );
* @param[out] src_attr is a pointer to the thread attribute
* structure to copy from.
*/
-RTEMS_INLINE_ROUTINE void _POSIX_Threads_Copy_attributes(
+RTEMS_INLINE_ROUTINE void _POSIX_Threads_Copy_attributes(
pthread_attr_t *dst_attr,
const pthread_attr_t *src_attr
);
@@ -132,8 +132,8 @@ RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Get(
*
* This routine initializes the thread attributes structure.
*/
-RTEMS_INLINE_ROUTINE void _POSIX_Threads_Initialize_attributes(
- pthread_attr_t *attr
+RTEMS_INLINE_ROUTINE void _POSIX_Threads_Initialize_attributes(
+ pthread_attr_t *attr
);
/**
@@ -210,7 +210,7 @@ int rtems_pthread_attribute_compare(
const pthread_attr_t *attr1,
const pthread_attr_t *attr2
);
-
+
/*
* _POSIX_Threads_Allocate
*/
@@ -224,19 +224,19 @@ RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Allocate( void )
* _POSIX_Threads_Copy_attributes
*/
-RTEMS_INLINE_ROUTINE void _POSIX_Threads_Copy_attributes(
+RTEMS_INLINE_ROUTINE void _POSIX_Threads_Copy_attributes(
pthread_attr_t *dst_attr,
const pthread_attr_t *src_attr
)
{
*dst_attr = *src_attr;
#if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
- _Assert(
+ _Assert(
dst_attr->affinitysetsize == sizeof(dst_attr->affinitysetpreallocated)
);
dst_attr->affinityset = &dst_attr->affinitysetpreallocated;
#endif
-}
+}
/*
* _POSIX_Threads_Free
@@ -266,15 +266,15 @@ RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Get (
* _POSIX_Threads_Initialize_attributes
*/
-RTEMS_INLINE_ROUTINE void _POSIX_Threads_Initialize_attributes(
- pthread_attr_t *attr
+RTEMS_INLINE_ROUTINE void _POSIX_Threads_Initialize_attributes(
+ pthread_attr_t *attr
)
{
_POSIX_Threads_Copy_attributes(
attr,
&_POSIX_Threads_Default_attributes
);
-}
+}
/*
* _POSIX_Threads_Is_null
diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c
index f432b1ba53..67b62ae67e 100644
--- a/cpukit/posix/src/pthread.c
+++ b/cpukit/posix/src/pthread.c
@@ -372,7 +372,7 @@ void _POSIX_Threads_Manager_initialization(void)
attr->affinitysetsize = sizeof( *attr->affinityset );
CPU_ZERO_S( attr->affinitysetsize, &attr->affinitysetpreallocated );
- for (i=0; i<max_cpus; i++)
+ for (i=0; i<max_cpus; i++)
CPU_SET_S(i, attr->affinitysetsize, attr->affinityset );
#endif
diff --git a/cpukit/posix/src/pthreadattrcompare.c b/cpukit/posix/src/pthreadattrcompare.c
index 8ec6fec33f..3ba57e7b79 100644
--- a/cpukit/posix/src/pthreadattrcompare.c
+++ b/cpukit/posix/src/pthreadattrcompare.c
@@ -48,8 +48,8 @@ int rtems_pthread_attribute_compare(
return 1;
if (memcmp(
- &attr1->schedparam,
- &attr2->schedparam,
+ &attr1->schedparam,
+ &attr2->schedparam,
sizeof(struct sched_param)
))
return 1;
@@ -71,16 +71,16 @@ int rtems_pthread_attribute_compare(
if ( attr1->affinitysetsize != attr2->affinitysetsize )
return 1;
- if (!CPU_EQUAL_S(
- attr1->affinitysetsize,
- attr1->affinityset,
+ if (!CPU_EQUAL_S(
+ attr1->affinitysetsize,
+ attr1->affinityset,
attr2->affinityset
))
return 1;
if (!CPU_EQUAL_S(
- attr1->affinitysetsize,
- &attr1->affinitysetpreallocated,
+ attr1->affinitysetsize,
+ &attr1->affinitysetpreallocated,
&attr2->affinitysetpreallocated
))
return 1;
diff --git a/cpukit/posix/src/pthreadattrsetaffinitynp.c b/cpukit/posix/src/pthreadattrsetaffinitynp.c
index 6a60aa2128..66811f101a 100644
--- a/cpukit/posix/src/pthreadattrsetaffinitynp.c
+++ b/cpukit/posix/src/pthreadattrsetaffinitynp.c
@@ -45,7 +45,7 @@ int pthread_attr_setaffinity_np(
error = _CPU_set_Is_valid( cpuset, cpusetsize );
if ( error != 0 )
return EINVAL;
-
+
CPU_COPY( attr->affinityset, cpuset );
return 0;
diff --git a/cpukit/posix/src/pthreadgetaffinitynp.c b/cpukit/posix/src/pthreadgetaffinitynp.c
index e92f800a1d..082e41adbd 100644
--- a/cpukit/posix/src/pthreadgetaffinitynp.c
+++ b/cpukit/posix/src/pthreadgetaffinitynp.c
@@ -41,7 +41,7 @@ int pthread_getaffinity_np(
if ( !cpuset )
return EFAULT;
-
+
the_thread = _Thread_Get( id, &location );
switch ( location ) {
diff --git a/cpukit/posix/src/pthreadsetaffinitynp.c b/cpukit/posix/src/pthreadsetaffinitynp.c
index f186935637..fc2194db30 100644
--- a/cpukit/posix/src/pthreadsetaffinitynp.c
+++ b/cpukit/posix/src/pthreadsetaffinitynp.c
@@ -45,7 +45,7 @@ int pthread_setaffinity_np(
error = _CPU_set_Is_valid( cpuset, cpusetsize );
if ( error != 0 )
return EINVAL;
-
+
the_thread = _Thread_Get( id, &location );
switch ( location ) {
diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h
index f17d51b7e5..91c924731d 100644
--- a/cpukit/rtems/include/rtems/rtems/tasks.h
+++ b/cpukit/rtems/include/rtems/rtems/tasks.h
@@ -494,7 +494,7 @@ rtems_status_code rtems_task_variable_delete(
/**
* @brief RTEMS Get Task Affinity
*
- * This directive returns the cpuset for the
+ * This directive returns the cpuset for the
* given task. The cpuset size must be the
* same size as the task affinity set size.
*
@@ -502,36 +502,36 @@ rtems_status_code rtems_task_variable_delete(
* @param[in] cpusetsize is the size of the cpuset
* @param[out] cpuset is the tasks affinity cpuset
*
- * @retval RTEMS_SUCCESSFUL if successful or error code if unsuccessful
+ * @retval RTEMS_SUCCESSFUL if successful or error code if unsuccessful
* @retval RTEMS_INVALID_ADDRESS if cpuset is NULL
* @retval RTEMS_INVALID_NUMBER if cpusetsize is incorrect
- * @retval RTEMS_INVALID_ID if id not valid
- */
+ * @retval RTEMS_INVALID_ID if id not valid
+ */
rtems_status_code rtems_task_get_affinity(
rtems_id id,
size_t cpusetsize,
- cpu_set_t *cpuset
+ cpu_set_t *cpuset
);
/**
* @brief RTEMS Set Task Affinity
*
- * This directive sets the given tasks
+ * This directive sets the given tasks
* affinity cpuset.
*
* @param[in] id is the thread to extract
* @param[in] cpusetsize is the size of the cpuset
* @param[in] cpuset is affinity set to assign to the task
*
- * @retval RTEMS_SUCCESSFUL if successful or error code if unsuccessful
+ * @retval RTEMS_SUCCESSFUL if successful or error code if unsuccessful
* @retval RTEMS_INVALID_ADDRESS if cpuset is NULL
- * @retval RTEMS_INVALID_NUMBER if cpuset or cpusetsize is incorrect
- * @retval RTEMS_INVALID_ID if id not valid
- */
+ * @retval RTEMS_INVALID_NUMBER if cpuset or cpusetsize is incorrect
+ * @retval RTEMS_INVALID_ID if id not valid
+ */
rtems_status_code rtems_task_set_affinity(
rtems_id id,
size_t cpusetsize,
- cpu_set_t *cpuset
+ cpu_set_t *cpuset
);
#endif
diff --git a/cpukit/rtems/src/taskgetaffinity.c b/cpukit/rtems/src/taskgetaffinity.c
index 9f625e334c..59fec12aae 100644
--- a/cpukit/rtems/src/taskgetaffinity.c
+++ b/cpukit/rtems/src/taskgetaffinity.c
@@ -27,7 +27,7 @@
rtems_status_code rtems_task_get_affinity(
rtems_id id,
size_t cpusetsize,
- cpu_set_t *cpuset
+ cpu_set_t *cpuset
)
{
Thread_Control *the_thread;
diff --git a/cpukit/rtems/src/tasksetaffinity.c b/cpukit/rtems/src/tasksetaffinity.c
index cecb2686a4..c919b48870 100644
--- a/cpukit/rtems/src/tasksetaffinity.c
+++ b/cpukit/rtems/src/tasksetaffinity.c
@@ -27,7 +27,7 @@
rtems_status_code rtems_task_set_affinity(
rtems_id id,
size_t cpusetsize,
- cpu_set_t *cpuset
+ cpu_set_t *cpuset
)
{
Thread_Control *the_thread;
diff --git a/cpukit/score/include/rtems/score/cpuset.h b/cpukit/score/include/rtems/score/cpuset.h
index 0359862a2b..a59ff1aea5 100644
--- a/cpukit/score/include/rtems/score/cpuset.h
+++ b/cpukit/score/include/rtems/score/cpuset.h
@@ -4,7 +4,7 @@
* @brief Information About the CPU Set
*
* This include file contains all information about the thread
- * CPU Set.
+ * CPU Set.
*/
/*
@@ -26,7 +26,7 @@ extern "C" {
#endif
#ifdef __RTEMS_HAVE_SYS_CPUSET_H__
-
+
/**
* @defgroup ScoreCpuset
*
@@ -41,7 +41,7 @@ extern "C" {
* The following defines the control block used to manage the cpuset.
* The names do not include affinity in the front in case the set is
* ever used for something other than affinity. The usage in thread
- * uses the attribute affinity such that accesses will read
+ * uses the attribute affinity such that accesses will read
* thread->affinity.set.
*/
typedef struct {
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h
index 74852385b5..ed12ad272a 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/cpukit/score/include/rtems/score/thread.h
@@ -422,7 +422,7 @@ struct Thread_Control_struct {
* in an SMP system.
*/
CPU_set_Control affinity;
-#endif
+#endif
#endif
#if __RTEMS_ADA__
diff --git a/cpukit/score/src/cpuset.c b/cpukit/score/src/cpuset.c
index 4cf24288b1..110f51c629 100644
--- a/cpukit/score/src/cpuset.c
+++ b/cpukit/score/src/cpuset.c
@@ -46,7 +46,7 @@ void _CPU_set_Handler_initialization()
cpuset_default.setsize = sizeof( *cpuset_default.set );
CPU_ZERO_S( cpuset_default.setsize, &cpuset_default.preallocated );
- for (i=0; i<max_cpus; i++)
+ for (i=0; i<max_cpus; i++)
CPU_SET_S(i, cpuset_default.setsize, cpuset_default.set );
}
@@ -85,7 +85,7 @@ int _CPU_set_Is_valid( const cpu_set_t *cpuset, size_t setsize )
*
* This routine returns the default cpuset.
*/
-const CPU_set_Control *_CPU_set_Default()
+const CPU_set_Control *_CPU_set_Default()
{
return &cpuset_default;
}
diff --git a/cpukit/score/src/cpusetprintsupport.c b/cpukit/score/src/cpusetprintsupport.c
index a56305e443..76851d3043 100644
--- a/cpukit/score/src/cpusetprintsupport.c
+++ b/cpukit/score/src/cpusetprintsupport.c
@@ -31,7 +31,7 @@
void _CPU_set_Show_with_plugin(
void *context,
rtems_printk_plugin_t print,
- const char *description,
+ const char *description,
const cpu_set_t *cpuset
);
@@ -44,7 +44,7 @@
void _CPU_set_Show_with_plugin(
void *context,
rtems_printk_plugin_t print,
- const char *description,
+ const char *description,
const cpu_set_t *cpuset
)
{
@@ -79,6 +79,6 @@
{
const CPU_set_Control *ctl;
ctl = _CPU_set_Default();
- _CPU_set_Show( description, ctl->set );
+ _CPU_set_Show( description, ctl->set );
}
#endif