diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-02-17 16:54:23 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-02-17 16:56:17 +0100 |
| commit | 77998753b522e28f1b6f92ebab407e1fcaef5296 (patch) | |
| tree | aff584f670dd662e85cba95aa96f97f802f52f04 /testsuites/psxtests | |
| parent | Add functions for greedy workspace allocation (diff) | |
| download | rtems-77998753b522e28f1b6f92ebab407e1fcaef5296.tar.bz2 | |
Use alternative API
Replaced Allocate_majority_of_workspace() with
rtems_workspace_allocate(). Replaced Allocate_majority_of_heap() with
rtems_heap_greedy_allocate().
Diffstat (limited to 'testsuites/psxtests')
| -rw-r--r-- | testsuites/psxtests/psxkey01/init.c | 6 | ||||
| -rw-r--r-- | testsuites/psxtests/psxmsgq02/init.c | 5 | ||||
| -rw-r--r-- | testsuites/psxtests/psxobj01/init.c | 3 |
3 files changed, 3 insertions, 11 deletions
diff --git a/testsuites/psxtests/psxkey01/init.c b/testsuites/psxtests/psxkey01/init.c index c7db1dfd96..9f684422af 100644 --- a/testsuites/psxtests/psxkey01/init.c +++ b/testsuites/psxtests/psxkey01/init.c @@ -17,10 +17,6 @@ #include "system.h" #include <errno.h> #include "tmacros.h" -#include <rtems/score/wkspace.h> -#include <rtems/score/heap.h> - -#include "test_support.h" void Key_destructor( void *key_data @@ -46,7 +42,7 @@ void *POSIX_Init( Init_id = pthread_self(); printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); - Allocate_majority_of_workspace(84); + rtems_workspace_greedy_allocate( 0 ); puts("Init: pthread_key_create - ENOMEM (Workspace not available)"); empty_line(); diff --git a/testsuites/psxtests/psxmsgq02/init.c b/testsuites/psxtests/psxmsgq02/init.c index a9cb686e38..3899294f46 100644 --- a/testsuites/psxtests/psxmsgq02/init.c +++ b/testsuites/psxtests/psxmsgq02/init.c @@ -17,15 +17,12 @@ #include "system.h" #include <errno.h> #include "tmacros.h" -#include <rtems/score/wkspace.h> -#include <rtems/score/heap.h> #include <mqueue.h> #include <sched.h> #include <fcntl.h> #include <time.h> #include <tmacros.h> #include <signal.h> /* signal facilities */ -#include "test_support.h" pthread_t Init_id; @@ -48,7 +45,7 @@ void *POSIX_Init( Init_id = pthread_self(); printf( "Init's ID is 0x%08" PRIxpthread_t "\n", Init_id ); - Allocate_majority_of_workspace(NAME_MAX); + rtems_workspace_greedy_allocate( 0 ); attr.mq_maxmsg = MAXMSG; attr.mq_msgsize = MSGSIZE; diff --git a/testsuites/psxtests/psxobj01/init.c b/testsuites/psxtests/psxobj01/init.c index 8d3cdcb9a2..070b891023 100644 --- a/testsuites/psxtests/psxobj01/init.c +++ b/testsuites/psxtests/psxobj01/init.c @@ -16,7 +16,6 @@ #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ #include <tmacros.h> -#include "test_support.h" rtems_task Init( rtems_task_argument ignored @@ -70,7 +69,7 @@ rtems_task Init( /* out of memory error ONLY when POSIX is enabled */ puts( "INIT - _Objects_Set_name fails - out of memory" ); - Allocate_majority_of_workspace( 1 ); + rtems_workspace_greedy_allocate( 0 ); bc = _Objects_Set_name( &TestClass, &_Thread_Executing->Object, name ); rtems_test_assert( bc == false ); |