diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-12-13 14:37:03 +0000 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-12-13 14:37:03 +0000 |
commit | 3df4d7424ad175acf3057e6af0c7db31d701fefd (patch) | |
tree | a6c8bf5db641daf40c8f8af9dd71d72135695141 /cpukit | |
parent | 2011-12-13 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
download | rtems-3df4d7424ad175acf3057e6af0c7db31d701fefd.tar.bz2 |
2011-12-13 Sebastian Huber <sebastian.huber@embedded-brains.de>
* sapi/include/confdefs.h: Fixed workspace size estimate of tasks.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 4 | ||||
-rw-r--r-- | cpukit/sapi/include/confdefs.h | 28 |
2 files changed, 20 insertions, 12 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f44e7b7206..c251cfc76f 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,9 @@ 2011-12-13 Sebastian Huber <sebastian.huber@embedded-brains.de> + * sapi/include/confdefs.h: Fixed workspace size estimate of tasks. + +2011-12-13 Sebastian Huber <sebastian.huber@embedded-brains.de> + * posix/src/mqueuenametoid.c, posix/src/semaphorenametoid.c: Removed files. * posix/src/psxnametoid.c: New file. diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index e2f5f0e947..169cb90761 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -1819,18 +1819,22 @@ rtems_fs_init_functions_t rtems_fs_init_helper = */ #define CONFIGURE_MEMORY_FOR_TASKS(_tasks, _number_FP_tasks) \ - ( \ - _Configure_Object_RAM(_tasks, sizeof(Thread_Control)) + \ - (_Configure_Max_Objects(_tasks) * \ - (CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API + \ - CONFIGURE_MEMORY_PER_TASK_FOR_NEWLIB + \ - CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API + \ - CONFIGURE_MEMORY_PER_TASK_FOR_SCHEDULER)) + \ - _Configure_From_workspace( \ - _Configure_Max_Objects(_number_FP_tasks) * CONTEXT_FP_SIZE) + \ - _Configure_From_workspace( \ - (CONFIGURE_MAXIMUM_USER_EXTENSIONS + 1) * sizeof(void *)) \ - ) + ( \ + _Configure_Object_RAM(_tasks, sizeof(Thread_Control)) \ + + _Configure_Max_Objects(_tasks) \ + * ( \ + CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \ + + CONFIGURE_MEMORY_PER_TASK_FOR_NEWLIB \ + + CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API \ + + CONFIGURE_MEMORY_PER_TASK_FOR_SCHEDULER \ + + _Configure_From_workspace( \ + (CONFIGURE_MAXIMUM_USER_EXTENSIONS + 1) * sizeof(void *) \ + ) \ + ) \ + + _Configure_Max_Objects(_number_FP_tasks) \ + * _Configure_From_workspace(CONTEXT_FP_SIZE) \ + * (CONTEXT_FP_SIZE != 0) \ + ) /** * This defines the amount of memory configured for the multiprocessing |