summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog4
-rw-r--r--cpukit/score/src/wkspace.c21
2 files changed, 19 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 741029a4ff..bbaf19ee3d 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,9 @@
2009-08-05 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * score/src/wkspace.c: Improve debug output.
+
+2009-08-05 Joel Sherrill <joel.sherrill@OARcorp.com>
+
* posix/include/rtems/posix/config.h, posix/src/mqueue.c,
sapi/include/confdefs.h: Add configuration of posix message queue
file descriptors as separate entity.
diff --git a/cpukit/score/src/wkspace.c b/cpukit/score/src/wkspace.c
index 30dc8d1fe9..fe6a4889c0 100644
--- a/cpukit/score/src/wkspace.c
+++ b/cpukit/score/src/wkspace.c
@@ -72,19 +72,19 @@ void *_Workspace_Allocate(
size_t size
)
{
- void *p;
+ void *memory;
- p = _Heap_Allocate( &_Workspace_Area, size );
+ memory = _Heap_Allocate( &_Workspace_Area, size );
#if defined(DEBUG_WORKSPACE)
printk(
"Workspace_Allocate(%d) from %p/%p -> %p\n",
size,
__builtin_return_address( 0 ),
__builtin_return_address( 1 ),
- p
+ memory
);
#endif
- return p;
+ return memory;
}
/*
@@ -112,9 +112,18 @@ void *_Workspace_Allocate_or_fatal_error(
size_t size
)
{
- void *memory;
+ void *memory;
- memory = _Workspace_Allocate( size );
+ memory = _Heap_Allocate( &_Workspace_Area, size );
+ #if defined(DEBUG_WORKSPACE)
+ printk(
+ "Workspace_Allocate_or_fatal_error(%d) from %p/%p -> %p\n",
+ size,
+ __builtin_return_address( 0 ),
+ __builtin_return_address( 1 ),
+ memory
+ );
+ #endif
if ( memory == NULL )
_Internal_error_Occurred(