change log for rtems (2011-12-13)

[rtems-vc at rtems.org]

 *sh*:
2011-12-13	Sebastian Huber <sebastian.huber at embedded-brains.de>

	* sapi/include/confdefs.h: Fixed workspace size estimate of POSIX keys
	and message queues.

M 1.3089  cpukit/ChangeLog
M  1.177  cpukit/sapi/include/confdefs.h

diff -u rtems/cpukit/ChangeLog:1.3088 rtems/cpukit/ChangeLog:1.3089
--- rtems/cpukit/ChangeLog:1.3088	Tue Dec 13 04:06:53 2011
+++ rtems/cpukit/ChangeLog	Tue Dec 13 04:52:19 2011
@@ -1,5 +1,10 @@
 2011-12-13	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
+	* sapi/include/confdefs.h: Fixed workspace size estimate of POSIX keys
+	and message queues.
+
+2011-12-13	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
 	* score/include/rtems/score/wkspace.h, score/src/wkstringduplicate.c:
 	Changed parameter of _Workspace_String_duplicate() to avoid strnlen().
 

diff -u rtems/cpukit/sapi/include/confdefs.h:1.176 rtems/cpukit/sapi/include/confdefs.h:1.177
--- rtems/cpukit/sapi/include/confdefs.h:1.176	Mon Dec  5 07:51:06 2011
+++ rtems/cpukit/sapi/include/confdefs.h	Tue Dec 13 04:52:21 2011
@@ -1527,17 +1527,14 @@
    */
   #define _Configure_POSIX_Named_Object_RAM(_number, _size) \
     _Configure_Object_RAM( (_number), _size ) + \
-    ((_number) + _Configure_From_workspace(NAME_MAX) )
+    ((_number) * _Configure_From_workspace(NAME_MAX) )
 
   #ifndef CONFIGURE_MAXIMUM_POSIX_THREADS
     #define CONFIGURE_MAXIMUM_POSIX_THREADS      0
   #endif
 
   #define CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API \
-    _Configure_From_workspace( \
-      sizeof (POSIX_API_Control) + \
-     (sizeof (void *) * (CONFIGURE_MAXIMUM_POSIX_KEYS)) \
-    )
+    _Configure_From_workspace(sizeof(POSIX_API_Control))
 
   #ifndef CONFIGURE_MAXIMUM_POSIX_MUTEXES
     #define CONFIGURE_MAXIMUM_POSIX_MUTEXES              0
@@ -1561,7 +1558,8 @@
     #define CONFIGURE_MEMORY_FOR_POSIX_KEYS(_keys) 0
   #else
     #define CONFIGURE_MEMORY_FOR_POSIX_KEYS(_keys) \
-      _Configure_Object_RAM(_keys, sizeof(POSIX_Keys_Control) )
+      (_Configure_Object_RAM(_keys, sizeof(POSIX_Keys_Control) ) \
+        + (_keys) * 3 * _Configure_From_workspace(sizeof(void *) * 2))
   #endif
 
   #ifndef CONFIGURE_MAXIMUM_POSIX_TIMERS
@@ -1598,7 +1596,7 @@
     #endif
 
     #define CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUE_DESCRIPTORS(_mqueue_fds) \
-      _Configure_POSIX_Named_Object_RAM( \
+      _Configure_Object_RAM( \
          _mqueue_fds, sizeof(POSIX_Message_queue_Control_fd) )
   #endif
 



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20111213/509c0662/attachment-0001.html>