RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Moved _Thread_Information -> _RTEMS_tasks_Information.

Browse Source 
Added a table of object information control blocks.

Modified _Thread_Get so it looks up a thread regardless of which
thread management "entity" (manager, internal, etc) actually "owns" it.
This commit is contained in:
Joel Sherrill
1995-08-23 21:06:31 +00:00
parent 3235ad9a2c
commit 5250ff39f0
73 changed files with 513 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
c/src/exec/rtems/headers/tasks.h
View File

@@ -61,6 +61,25 @@ extern "C" {
#define RTEMS_YIELD_PROCESSOR RTEMS_NO_TIMEOUT
/*
* The following defines the information control block used to
* manage this class of objects.
*/
EXTERN Objects_Information _RTEMS_tasks_Information;
/*
* _RTEMS_tasks_Manager_initialization
*
* DESCRIPTION:
*
* This routine initializes all Task Manager related data structures.
*/
void _RTEMS_tasks_Manager_initialization(
unsigned32 maximum_tasks
);
/*
* rtems_task_create
*

19
c/src/exec/rtems/include/rtems/rtems/tasks.h
View File

@@ -61,6 +61,25 @@ extern "C" {
#define RTEMS_YIELD_PROCESSOR RTEMS_NO_TIMEOUT
/*
* The following defines the information control block used to
* manage this class of objects.
*/
EXTERN Objects_Information _RTEMS_tasks_Information;
/*
* _RTEMS_tasks_Manager_initialization
*
* DESCRIPTION:
*
* This routine initializes all Task Manager related data structures.
*/
void _RTEMS_tasks_Manager_initialization(
unsigned32 maximum_tasks
);
/*
* rtems_task_create
*

4
c/src/exec/rtems/inline/rtems/rtems/tasks.inl
View File

@@ -30,7 +30,7 @@
STATIC INLINE Thread_Control *_RTEMS_tasks_Allocate( void )
{
return (Thread_Control *) _Objects_Allocate( &_Thread_Information );
return (Thread_Control *) _Objects_Allocate( &_RTEMS_tasks_Information );
}
/*PAGE
@@ -43,7 +43,7 @@ STATIC INLINE void _RTEMS_tasks_Free (
Thread_Control *the_task
)
{
_Objects_Free( &_Thread_Information, &the_task->Object );
_Objects_Free( &_RTEMS_tasks_Information, &the_task->Object );
}
/*PAGE

4
c/src/exec/rtems/inline/tasks.inl
View File

@@ -30,7 +30,7 @@
STATIC INLINE Thread_Control *_RTEMS_tasks_Allocate( void )
{
return (Thread_Control *) _Objects_Allocate( &_Thread_Information );
return (Thread_Control *) _Objects_Allocate( &_RTEMS_tasks_Information );
}
/*PAGE
@@ -43,7 +43,7 @@ STATIC INLINE void _RTEMS_tasks_Free (
Thread_Control *the_task
)
{
_Objects_Free( &_Thread_Information, &the_task->Object );
_Objects_Free( &_RTEMS_tasks_Information, &the_task->Object );
}
/*PAGE

4
c/src/exec/rtems/macros/rtems/rtems/tasks.inl
View File

@@ -29,7 +29,7 @@
*/
#define _RTEMS_tasks_Allocate() \
(Thread_Control *) _Objects_Allocate( &_Thread_Information )
(Thread_Control *) _Objects_Allocate( &_RTEMS_tasks_Information )
/*PAGE
*
@@ -38,7 +38,7 @@
*/
#define _RTEMS_tasks_Free( _the_task ) \
_Objects_Free( &_Thread_Information, &(_the_task)->Object )
_Objects_Free( &_RTEMS_tasks_Information, &(_the_task)->Object )
/*PAGE
*

4
c/src/exec/rtems/macros/tasks.inl
View File

@@ -29,7 +29,7 @@
*/
#define _RTEMS_tasks_Allocate() \
(Thread_Control *) _Objects_Allocate( &_Thread_Information )
(Thread_Control *) _Objects_Allocate( &_RTEMS_tasks_Information )
/*PAGE
*
@@ -38,7 +38,7 @@
*/
#define _RTEMS_tasks_Free( _the_task ) \
_Objects_Free( &_Thread_Information, &(_the_task)->Object )
_Objects_Free( &_RTEMS_tasks_Information, &(_the_task)->Object )
/*PAGE
*

3
c/src/exec/rtems/src/dpmem.c
View File

@@ -43,7 +43,8 @@ void _Dual_ported_memory_Manager_initialization(
maximum_ports,
sizeof( Dual_ported_memory_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
c/src/exec/rtems/src/msg.c
View File

@@ -51,7 +51,8 @@ void _Message_queue_Manager_initialization(
maximum_message_queues,
sizeof( Message_queue_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
c/src/exec/rtems/src/part.c
View File

@@ -45,7 +45,8 @@ void _Partition_Manager_initialization(
maximum_partitions,
sizeof( Partition_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
c/src/exec/rtems/src/ratemon.c
View File

@@ -47,7 +47,8 @@ void _Rate_monotonic_Manager_initialization(
maximum_periods,
sizeof( Rate_monotonic_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
c/src/exec/rtems/src/region.c
View File

@@ -45,7 +45,8 @@ void _Region_Manager_initialization(
maximum_regions,
sizeof( Region_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
c/src/exec/rtems/src/rtemstimer.c
View File

@@ -44,7 +44,8 @@ void _Timer_Manager_initialization(
maximum_timers,
sizeof( Timer_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
c/src/exec/rtems/src/sem.c
View File

@@ -62,7 +62,8 @@ void _Semaphore_Manager_initialization(
maximum_semaphores,
sizeof( Semaphore_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

4
c/src/exec/rtems/src/taskmp.c
View File

@@ -194,7 +194,7 @@ void _RTEMS_tasks_MP_Process_packet (
case RTEMS_TASKS_MP_ANNOUNCE_CREATE:
ignored = _Objects_MP_Open(
&_Thread_Information,
&_RTEMS_tasks_Information,
the_packet->name,
the_packet->Prefix.id,
TRUE
@@ -205,7 +205,7 @@ void _RTEMS_tasks_MP_Process_packet (
case RTEMS_TASKS_MP_ANNOUNCE_DELETE:
_Objects_MP_Close( &_Thread_Information, the_packet->Prefix.id );
_Objects_MP_Close( &_RTEMS_tasks_Information, the_packet->Prefix.id );
_MPCI_Return_packet( the_packet_prefix );
break;

38
c/src/exec/rtems/src/tasks.c
View File

@@ -26,6 +26,34 @@
#include <rtems/userext.h>
#include <rtems/wkspace.h>
/*PAGE
*
* _RTEMS_tasks_Manager_initialization
*
* This routine initializes all Task Manager related data structures.
*
* Input parameters:
* maximum_tasks - number of tasks to initialize
*
* Output parameters: NONE
*/
void _RTEMS_tasks_Manager_initialization(
unsigned32 maximum_tasks
)
{
_Objects_Initialize_information(
&_RTEMS_tasks_Information,
OBJECTS_RTEMS_TASKS,
TRUE,
maximum_tasks,
sizeof( Thread_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH,
TRUE
);
}
/*PAGE
*
* rtems_task_create
@@ -136,7 +164,7 @@ rtems_status_code rtems_task_create(
the_thread->Start.fp_context = the_thread->fp_context;
if ( _Attributes_Is_global( the_attribute_set ) &&
!( _Objects_MP_Open( &_Thread_Information, name,
!( _Objects_MP_Open( &_RTEMS_tasks_Information, name,
the_thread->Object.id, FALSE ) ) ) {
_RTEMS_tasks_Free( the_thread );
(void) _Workspace_Free( memory );
@@ -157,7 +185,7 @@ rtems_status_code rtems_task_create(
_ASR_Initialize( &the_thread->Signal );
_Objects_Open( &_Thread_Information, &the_thread->Object, &name );
_Objects_Open( &_RTEMS_tasks_Information, &the_thread->Object, &name );
*id = the_thread->Object.id;
@@ -199,7 +227,7 @@ rtems_status_code rtems_task_ident(
)
{
if ( name != OBJECTS_ID_OF_SELF )
return( _Objects_Name_to_id( &_Thread_Information, &name, node, id ) );
return( _Objects_Name_to_id( &_RTEMS_tasks_Information, &name, node, id ) );
*id = _Thread_Executing->Object.id;
return( RTEMS_SUCCESSFUL );
@@ -368,7 +396,7 @@ rtems_status_code rtems_task_delete(
_Thread_Dispatch();
return( RTEMS_ILLEGAL_ON_REMOTE_OBJECT );
case OBJECTS_LOCAL:
_Objects_Close( &_Thread_Information, &the_thread->Object );
_Objects_Close( &_RTEMS_tasks_Information, &the_thread->Object );
_Thread_Set_state( the_thread, STATES_TRANSIENT );
@@ -388,7 +416,7 @@ rtems_status_code rtems_task_delete(
if ( _Attributes_Is_global( the_thread->attribute_set ) ) {
_Objects_MP_Close( &_Thread_Information, the_thread->Object.id );
_Objects_MP_Close( &_RTEMS_tasks_Information, the_thread->Object.id );
_RTEMS_tasks_MP_Send_process_packet(
RTEMS_TASKS_MP_ANNOUNCE_DELETE,

3
c/src/exec/rtems/src/timer.c
View File

@@ -44,7 +44,8 @@ void _Timer_Manager_initialization(
maximum_timers,
sizeof( Timer_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
c/src/exec/sapi/src/exinit.c
View File

@@ -152,7 +152,6 @@ rtems_interrupt_level rtems_initialize_executive_early(
_TOD_Handler_initialization( configuration_table->microseconds_per_tick );
_Thread_Handler_initialization(
configuration_table->maximum_tasks,
configuration_table->ticks_per_timeslice,
multiprocessing_table->maximum_proxies
);
@@ -165,6 +164,8 @@ rtems_interrupt_level rtems_initialize_executive_early(
_Multiprocessing_Manager_initialization();
_RTEMS_tasks_Manager_initialization( configuration_table->maximum_tasks );
_Timer_Manager_initialization( configuration_table->maximum_timers );
_Extension_Manager_initialization( configuration_table->maximum_extensions );

3
c/src/exec/sapi/src/extension.c
View File

@@ -42,7 +42,8 @@ void _Extension_Manager_initialization(
maximum_extensions,
sizeof( Extension_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

36
c/src/exec/score/headers/object.h
View File

@@ -78,17 +78,21 @@ typedef unsigned32 Objects_Id;
typedef enum {
OBJECTS_NO_CLASS = 0,
OBJECTS_RTEMS_TASKS = 1,
OBJECTS_RTEMS_TIMERS = 2,
OBJECTS_RTEMS_SEMAPHORES = 3,
OBJECTS_RTEMS_MESSAGE_QUEUES = 4,
OBJECTS_RTEMS_PARTITIONS = 5,
OBJECTS_RTEMS_REGIONS = 6,
OBJECTS_RTEMS_PORTS = 7,
OBJECTS_RTEMS_PERIODS = 8,
OBJECTS_RTEMS_EXTENSIONS = 9
OBJECTS_INTERNAL_THREADS = 1,
OBJECTS_RTEMS_TASKS = 2,
OBJECTS_RTEMS_TIMERS = 3,
OBJECTS_RTEMS_SEMAPHORES = 4,
OBJECTS_RTEMS_MESSAGE_QUEUES = 5,
OBJECTS_RTEMS_PARTITIONS = 6,
OBJECTS_RTEMS_REGIONS = 7,
OBJECTS_RTEMS_PORTS = 8,
OBJECTS_RTEMS_PERIODS = 9,
OBJECTS_RTEMS_EXTENSIONS = 10
} Objects_Classes;
#define OBJECTS_CLASSES_FIRST OBJECTS_NO_CLASS
#define OBJECTS_CLASSES_LAST OBJECTS_RTEMS_EXTENSIONS
/*
* This enumerated type lists the locations which may be returned
* by _Objects_Get. These codes indicate the success of locating
@@ -128,6 +132,8 @@ typedef struct {
Chain_Control Inactive; /* chain of inactive ctl blocks */
boolean is_string; /* TRUE if names are strings */
unsigned32 name_length; /* maximum length of names */
boolean is_thread; /* TRUE if these are threads */
/* irregardless of API */
} Objects_Information;
/*
@@ -137,6 +143,15 @@ typedef struct {
EXTERN unsigned32 _Objects_Local_node;
/*
* The following is the list of information blocks for each object
* class. From the ID, we can go to one of these information blocks,
* and obtain a pointer to the appropriate object control block.
*/
EXTERN Objects_Information
*_Objects_Information_table[OBJECTS_CLASSES_LAST + 1];
/*
* The following defines the constant which may be used
* with _Objects_Get to manipulate the calling task.
@@ -201,7 +216,8 @@ void _Objects_Initialize_information (
unsigned32 maximum,
unsigned32 size,
boolean is_string,
unsigned32 maximum_name_length
unsigned32 maximum_name_length,
boolean is_task
);
/*

8
c/src/exec/score/headers/thread.h
View File

@@ -228,13 +228,6 @@ EXTERN Thread_Control *_Thread_Heir;
EXTERN Thread_Control *_Thread_Allocated_fp;
/*
* The following defines the information control block used to
* manage this class of objects.
*/
EXTERN Objects_Information _Thread_Information;
/*
* The following context area contains the context of the "thread"
* which invoked rtems_initialize_executive. This context is restored
@@ -254,7 +247,6 @@ EXTERN Context_Control _Thread_BSP_context;
*/
void _Thread_Handler_initialization (
unsigned32 maximum_tasks,
unsigned32 ticks_per_timeslice,
unsigned32 maximum_proxies
);

36
c/src/exec/score/include/rtems/score/object.h
View File

@@ -78,17 +78,21 @@ typedef unsigned32 Objects_Id;
typedef enum {
OBJECTS_NO_CLASS = 0,
OBJECTS_RTEMS_TASKS = 1,
OBJECTS_RTEMS_TIMERS = 2,
OBJECTS_RTEMS_SEMAPHORES = 3,
OBJECTS_RTEMS_MESSAGE_QUEUES = 4,
OBJECTS_RTEMS_PARTITIONS = 5,
OBJECTS_RTEMS_REGIONS = 6,
OBJECTS_RTEMS_PORTS = 7,
OBJECTS_RTEMS_PERIODS = 8,
OBJECTS_RTEMS_EXTENSIONS = 9
OBJECTS_INTERNAL_THREADS = 1,
OBJECTS_RTEMS_TASKS = 2,
OBJECTS_RTEMS_TIMERS = 3,
OBJECTS_RTEMS_SEMAPHORES = 4,
OBJECTS_RTEMS_MESSAGE_QUEUES = 5,
OBJECTS_RTEMS_PARTITIONS = 6,
OBJECTS_RTEMS_REGIONS = 7,
OBJECTS_RTEMS_PORTS = 8,
OBJECTS_RTEMS_PERIODS = 9,
OBJECTS_RTEMS_EXTENSIONS = 10
} Objects_Classes;
#define OBJECTS_CLASSES_FIRST OBJECTS_NO_CLASS
#define OBJECTS_CLASSES_LAST OBJECTS_RTEMS_EXTENSIONS
/*
* This enumerated type lists the locations which may be returned
* by _Objects_Get. These codes indicate the success of locating
@@ -128,6 +132,8 @@ typedef struct {
Chain_Control Inactive; /* chain of inactive ctl blocks */
boolean is_string; /* TRUE if names are strings */
unsigned32 name_length; /* maximum length of names */
boolean is_thread; /* TRUE if these are threads */
/* irregardless of API */
} Objects_Information;
/*
@@ -137,6 +143,15 @@ typedef struct {
EXTERN unsigned32 _Objects_Local_node;
/*
* The following is the list of information blocks for each object
* class. From the ID, we can go to one of these information blocks,
* and obtain a pointer to the appropriate object control block.
*/
EXTERN Objects_Information
*_Objects_Information_table[OBJECTS_CLASSES_LAST + 1];
/*
* The following defines the constant which may be used
* with _Objects_Get to manipulate the calling task.
@@ -201,7 +216,8 @@ void _Objects_Initialize_information (
unsigned32 maximum,
unsigned32 size,
boolean is_string,
unsigned32 maximum_name_length
unsigned32 maximum_name_length,
boolean is_task
);
/*

8
c/src/exec/score/include/rtems/score/thread.h
View File

@@ -228,13 +228,6 @@ EXTERN Thread_Control *_Thread_Heir;
EXTERN Thread_Control *_Thread_Allocated_fp;
/*
* The following defines the information control block used to
* manage this class of objects.
*/
EXTERN Objects_Information _Thread_Information;
/*
* The following context area contains the context of the "thread"
* which invoked rtems_initialize_executive. This context is restored
@@ -254,7 +247,6 @@ EXTERN Context_Control _Thread_BSP_context;
*/
void _Thread_Handler_initialization (
unsigned32 maximum_tasks,
unsigned32 ticks_per_timeslice,
unsigned32 maximum_proxies
);

29
c/src/exec/score/inline/rtems/score/thread.inl
View File

@@ -231,6 +231,7 @@ STATIC INLINE boolean _Thread_Is_null (
*
* _Thread_Get
*
* NOTE: XXX... This routine may be able to be optimized.
*/
STATIC INLINE Thread_Control *_Thread_Get (
@@ -238,14 +239,30 @@ STATIC INLINE Thread_Control *_Thread_Get (
Objects_Locations *location
)
{
Objects_Classes the_class;
Objects_Information *information;
if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ) {
_Thread_Disable_dispatch();
*location = OBJECTS_LOCAL;
return( _Thread_Executing );
_Thread_Disable_dispatch();
*location = OBJECTS_LOCAL;
return( _Thread_Executing );
}
return (Thread_Control *)
_Objects_Get( &_Thread_Information, id, location );
the_class = rtems_get_class( id );
if ( the_class > OBJECTS_CLASSES_LAST ) {
*location = OBJECTS_ERROR;
return (Thread_Control *) 0;
}
information = _Objects_Information_table[ the_class ];
if ( !information || !information->is_thread ) {
*location = OBJECTS_ERROR;
return (Thread_Control *) 0;
}
return (Thread_Control *) _Objects_Get( information, id, location );
}
#endif

29
c/src/exec/score/inline/thread.inl
View File

@@ -231,6 +231,7 @@ STATIC INLINE boolean _Thread_Is_null (
*
* _Thread_Get
*
* NOTE: XXX... This routine may be able to be optimized.
*/
STATIC INLINE Thread_Control *_Thread_Get (
@@ -238,14 +239,30 @@ STATIC INLINE Thread_Control *_Thread_Get (
Objects_Locations *location
)
{
Objects_Classes the_class;
Objects_Information *information;
if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ) {
_Thread_Disable_dispatch();
*location = OBJECTS_LOCAL;
return( _Thread_Executing );
_Thread_Disable_dispatch();
*location = OBJECTS_LOCAL;
return( _Thread_Executing );
}
return (Thread_Control *)
_Objects_Get( &_Thread_Information, id, location );
the_class = rtems_get_class( id );
if ( the_class > OBJECTS_CLASSES_LAST ) {
*location = OBJECTS_ERROR;
return (Thread_Control *) 0;
}
information = _Objects_Information_table[ the_class ];
if ( !information || !information->is_thread ) {
*location = OBJECTS_ERROR;
return (Thread_Control *) 0;
}
return (Thread_Control *) _Objects_Get( information, id, location );
}
#endif

14
c/src/exec/score/src/object.c
View File

@@ -68,7 +68,8 @@ void _Objects_Initialize_information(
unsigned32 maximum,
unsigned32 size,
boolean is_string,
unsigned32 maximum_name_length
unsigned32 maximum_name_length,
boolean is_thread
)
{
unsigned32 minimum_index;
@@ -80,6 +81,13 @@ void _Objects_Initialize_information(
information->maximum = maximum;
information->the_class = the_class;
information->is_string = is_string;
information->is_thread = is_thread;
/*
* Set the entry in the object information table.
*/
_Objects_Information_table[ the_class ] = information;
/*
* Calculate minimum and maximum Id's
@@ -379,8 +387,8 @@ rtems_status_code _Objects_Name_to_id(
Objects_Control *_Objects_Get(
Objects_Information *information,
Objects_Id id,
Objects_Locations *location
Objects_Id id,
Objects_Locations *location
)
{
Objects_Control *the_object;

47
c/src/exec/score/src/thread.c
View File

@@ -35,14 +35,13 @@
* This routine initializes all thread manager related data structures.
*
* Input parameters:
* maximum_tasks - number of tasks to initialize
* ticks_per_timeslice - clock ticks per quantum
* maximum_proxies - number of proxies to initialize
*
* Output parameters: NONE
*/
void _Thread_Handler_initialization(
unsigned32 maximum_tasks,
unsigned32 ticks_per_timeslice,
unsigned32 maximum_proxies
)
@@ -57,16 +56,6 @@ void _Thread_Handler_initialization(
_Thread_Ticks_remaining_in_timeslice = ticks_per_timeslice;
_Thread_Ticks_per_timeslice = ticks_per_timeslice;
_Objects_Initialize_information(
&_Thread_Information,
OBJECTS_RTEMS_TASKS,
TRUE,
maximum_tasks,
sizeof( Thread_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
);
_Thread_Ready_chain = _Workspace_Allocate_or_fatal_error(
(RTEMS_MAXIMUM_PRIORITY + 1) * sizeof(Chain_Control)
);
@@ -789,22 +778,40 @@ boolean _Thread_Change_mode(
*
* NOTE: If we are not using static inlines, this must be a real
* subroutine call.
*
* NOTE: XXX... This routine may be able to be optimized.
*/
#ifndef USE_INLINES
STATIC INLINE Thread_Control *_Thread_Get (
Objects_Id id,
Objects_Locations *location
Objects_Id id,
Objects_Locations *location
)
{
Objects_Classes the_class;
Objects_Information *information;
if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ) {
_Thread_Disable_dispatch();
*location = OBJECTS_LOCAL;
return( _Thread_Executing );
_Thread_Disable_dispatch();
*location = OBJECTS_LOCAL;
return( _Thread_Executing );
}
return (Thread_Control *) _Objects_Get( &_Thread_Information, id, location );
the_class = rtems_get_class( id );
if ( the_class > OBJECTS_CLASSES_LAST ) {
*location = OBJECTS_ERROR;
return (Thread_Control *) 0;
}
information = _Objects_Information_table[ the_class ];
if ( !information || !information->is_thread ) {
*location = OBJECTS_ERROR;
return (Thread_Control *) 0;
}
return (Thread_Control *) _Objects_Get( information, id, location );
}
#endif

2
c/src/lib/libmisc/monitor/mon-object.c
View File

@@ -60,7 +60,7 @@ rtems_monitor_object_info_t rtems_monitor_object_info[] =
(rtems_monitor_object_dump_fn) rtems_monitor_init_task_dump,
},
{ RTEMS_OBJECT_TASK,
(void *) &_Thread_Information,
(void *) &_RTEMS_tasks_Information,
sizeof(rtems_monitor_task_t),
(rtems_monitor_object_next_fn) rtems_monitor_manager_next,
(rtems_monitor_object_canonical_fn) rtems_monitor_task_canonical,

26
c/src/lib/libmisc/stackchk/check.c
View File

@@ -415,9 +415,11 @@ void Stack_check_Fatal_extension( unsigned32 status )
void Stack_check_Dump_usage( void )
{
unsigned32 i;
Thread_Control *the_thread;
unsigned32 hit_running = 0;
unsigned32 i;
unsigned32 class_index;
Thread_Control *the_thread;
unsigned32 hit_running = 0;
Objects_Information *information;
if (stack_check_initialized == 0)
return;
@@ -425,11 +427,19 @@ void Stack_check_Dump_usage( void )
printf(
" ID NAME LOW HIGH AVAILABLE USED\n"
);
for ( i=1 ; i<_Thread_Information.maximum ; i++ ) {
the_thread = (Thread_Control *)_Thread_Information.local_table[ i ];
Stack_check_Dump_threads_usage( the_thread );
if ( the_thread == _Thread_Executing )
hit_running = 1;
for ( class_index = OBJECTS_CLASSES_FIRST ;
class_index <= OBJECTS_CLASSES_LAST ;
class_index++ ) {
information = _Objects_Information_table[ class_index ];
if ( information && information->is_thread ) {
for ( i=1 ; i < information->maximum ; i++ ) {
the_thread = (Thread_Control *)information->local_table[ i ];
Stack_check_Dump_threads_usage( the_thread );
if ( the_thread == _Thread_Executing )
hit_running = 1;
}
}
}
if ( !hit_running )

2
c/src/libmisc/monitor/mon-object.c
View File

@@ -60,7 +60,7 @@ rtems_monitor_object_info_t rtems_monitor_object_info[] =
(rtems_monitor_object_dump_fn) rtems_monitor_init_task_dump,
},
{ RTEMS_OBJECT_TASK,
(void *) &_Thread_Information,
(void *) &_RTEMS_tasks_Information,
sizeof(rtems_monitor_task_t),
(rtems_monitor_object_next_fn) rtems_monitor_manager_next,
(rtems_monitor_object_canonical_fn) rtems_monitor_task_canonical,

26
c/src/libmisc/stackchk/check.c
View File

@@ -415,9 +415,11 @@ void Stack_check_Fatal_extension( unsigned32 status )
void Stack_check_Dump_usage( void )
{
unsigned32 i;
Thread_Control *the_thread;
unsigned32 hit_running = 0;
unsigned32 i;
unsigned32 class_index;
Thread_Control *the_thread;
unsigned32 hit_running = 0;
Objects_Information *information;
if (stack_check_initialized == 0)
return;
@@ -425,11 +427,19 @@ void Stack_check_Dump_usage( void )
printf(
" ID NAME LOW HIGH AVAILABLE USED\n"
);
for ( i=1 ; i<_Thread_Information.maximum ; i++ ) {
the_thread = (Thread_Control *)_Thread_Information.local_table[ i ];
Stack_check_Dump_threads_usage( the_thread );
if ( the_thread == _Thread_Executing )
hit_running = 1;
for ( class_index = OBJECTS_CLASSES_FIRST ;
class_index <= OBJECTS_CLASSES_LAST ;
class_index++ ) {
information = _Objects_Information_table[ class_index ];
if ( information && information->is_thread ) {
for ( i=1 ; i < information->maximum ; i++ ) {
the_thread = (Thread_Control *)information->local_table[ i ];
Stack_check_Dump_threads_usage( the_thread );
if ( the_thread == _Thread_Executing )
hit_running = 1;
}
}
}
if ( !hit_running )

4
c/src/tests/sptests/sp02/sp02.scn
View File

@@ -5,8 +5,8 @@ INIT - suspending TA2 while middle task on a ready chain
TA1 - rtems_task_wake_after - sleep 1 second
TA2 - rtems_task_wake_after - sleep 1 minute
TA3 - rtems_task_wake_after - sleep 5 seconds
TA1 - rtems_task_ident - tid of TA2 (0x04010007)
TA1 - rtems_task_ident - tid of TA3 (0x04010008)
TA1 - rtems_task_ident - tid of TA2 (0x08010007)
TA1 - rtems_task_ident - tid of TA3 (0x08010008)
TA1 - rtems_task_set_priority - set TA3's priority to 2
TA1 - rtems_task_suspend - suspend TA2
TA1 - rtems_task_delete - delete TA2

2
c/src/tests/sptests/sp12/sp12.scn
View File

@@ -35,7 +35,7 @@ PRI5 - rtems_semaphore_release - nested
PRI5 - rtems_semaphore_release - restore priority
PRI5 - priority of PRI5 is 68
<pause>
TA1 - rtems_semaphore_ident - smid => 0c010001
TA1 - rtems_semaphore_ident - smid => 10010001
TA1 - rtems_semaphore_obtain - wait forever on SM2
TA1 - got SM2
TA1 - rtems_semaphore_obtain - wait forever on SM3

2
c/src/tests/sptests/sp13/sp13.scn
View File

@@ -1,5 +1,5 @@
*** TEST 13 ***
TA1 - rtems_message_queue_ident - qid => 10010001
TA1 - rtems_message_queue_ident - qid => 14010001
TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1
TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1
TA1 - rtems_task_wake_after - sleep 5 seconds

4
c/src/tests/sptests/sp15/sp15.scn
View File

@@ -1,8 +1,8 @@
*** TEST 15 ***
INIT - rtems_partition_create - partition 1
INIT - rtems_partition_create - partition 2
TA1 - rtems_partition_ident - partition 1 id = 14010001
TA1 - rtems_partition_ident - partition 2 id = 14010002
TA1 - rtems_partition_ident - partition 1 id = 18010001
TA1 - rtems_partition_ident - partition 2 id = 18010002
TA1 - rtems_partition_get_buffer - buffer 1 from partition 1 - 0x00000000
TA1 - rtems_partition_get_buffer - buffer 2 from partition 1 - 0x00000200
TA1 - rtems_partition_get_buffer - buffer 1 from partition 2 - 0x00000000

2
c/src/tests/sptests/sp16/sp16.scn
View File

@@ -1,5 +1,5 @@
*** TEST 16 ***
TA1 - rtems_region_ident - rnid => 18010002
TA1 - rtems_region_ident - rnid => 1c010002
TA1 - rtems_region_get_segment - wait on 100 byte segment from region 2
TA1 - got segment from region 2 - 0x00000f78
TA1 - rtems_region_get_segment - wait on 3K segment from region 3

30
c/src/tests/sptests/sp20/sp20.scn
View File

@@ -1,19 +1,19 @@
*** TEST 20 ***
TA1 - rtems_rate_monotonic_create id = 0x20010001
TA1 - rtems_rate_monotonic_ident id = 0x20010001
TA1 - (0x20010001) period 2
TA2 - rtems_rate_monotonic_create id = 0x20010002
TA2 - rtems_rate_monotonic_ident id = 0x20010002
TA2 - (0x20010002) period 2
TA3 - rtems_rate_monotonic_create id = 0x20010003
TA3 - rtems_rate_monotonic_ident id = 0x20010003
TA3 - (0x20010003) period 2
TA4 - rtems_rate_monotonic_create id = 0x20010004
TA4 - rtems_rate_monotonic_ident id = 0x20010004
TA4 - (0x20010004) period 2
TA5 - rtems_rate_monotonic_create id = 0x20010005
TA5 - rtems_rate_monotonic_ident id = 0x20010005
TA5 - (0x20010005) period 100
TA1 - rtems_rate_monotonic_create id = 0x24010001
TA1 - rtems_rate_monotonic_ident id = 0x24010001
TA1 - (0x24010001) period 2
TA2 - rtems_rate_monotonic_create id = 0x24010002
TA2 - rtems_rate_monotonic_ident id = 0x24010002
TA2 - (0x24010002) period 2
TA3 - rtems_rate_monotonic_create id = 0x24010003
TA3 - rtems_rate_monotonic_ident id = 0x24010003
TA3 - (0x24010003) period 2
TA4 - rtems_rate_monotonic_create id = 0x24010004
TA4 - rtems_rate_monotonic_ident id = 0x24010004
TA4 - (0x24010004) period 2
TA5 - rtems_rate_monotonic_create id = 0x24010005
TA5 - rtems_rate_monotonic_ident id = 0x24010005
TA5 - (0x24010005) period 100
TA5 - PERIODS CHECK OK (1)
TA5 - PERIODS CHECK OK (2)
TA5 - PERIODS CHECK OK (3)

4
c/src/tests/sptests/sp22/sp22.scn
View File

@@ -1,8 +1,8 @@
*** TEST 22 ***
INIT - rtems_timer_create - creating timer 1
INIT - timer 1 has id (0x8010001)
INIT - timer 1 has id (0xc010001)
TA1 - rtems_timer_ident - identing timer 1
TA1 - timer 1 has id (0x8010001)
TA1 - timer 1 has id (0xc010001)
TA1 - rtems_clock_get - 09:00:00 12/31/1988
TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
TA1 - rtems_task_suspend( RTEMS_SELF )

2
c/src/tests/sptests/sp23/sp23.scn
View File

@@ -1,6 +1,6 @@
*** TEST 23 ***
INIT - rtems_port_create - DP1 - int = 0x00001000 ext = 0x00002000
TA1 - rtems_port_ident - 00010001
TA1 - rtems_port_ident - 0x20010001
TA1 - rtems_port_external_to_internal - 0x0000200e => 0x0000100e
TA1 - rtems_port_internal_to_external - 0x0000100e => 0x0000200e
TA1 - rtems_port_external_to_internal - 0x0000300e => 0x0000300e

2
c/src/tests/sptests/sp23/task1.c
View File

@@ -33,7 +33,7 @@ rtems_task Task_1(
status = rtems_port_ident( Port_name[ 1 ], &dpid );
directive_failed( status, "rtems_port_ident" );
printf( "TA1 - rtems_port_ident - %08x\n", dpid );
printf( "TA1 - rtems_port_ident - 0x%08x\n", dpid );
to_be_converted = &External_port_area[ 0xe ];
status = rtems_port_external_to_internal(

2
c/src/tests/sptests/sp25/sp25.scn
View File

@@ -1,5 +1,5 @@
*** TEST 25 ***
TA1 - rtems_region_ident - 0x18010002
TA1 - rtems_region_ident - 0x1c010002
TA1 - rtems_region_get_segment - wait on 64 byte segment from region 1
TA1 - got segment from region 1 - 0x0000f9b8
TA1 - rtems_region_get_segment - wait on 128 byte segment from region 1

3
c/src/tests/sptests/spsize/size.c
View File

@@ -295,7 +295,7 @@ uninitialized =
/*taskmp.h*/ 0 +
/*tasks.h*/ 0 +
/*tasks.h*/ (sizeof _RTEMS_tasks_Information) +
/*thread.h*/ (sizeof _Thread_Dispatch_disable_level) +
(sizeof _Thread_Ticks_remaining_in_timeslice) +
@@ -304,7 +304,6 @@ uninitialized =
(sizeof _Thread_Executing) +
(sizeof _Thread_Heir) +
(sizeof _Thread_Allocated_fp) +
(sizeof _Thread_Information) +
(sizeof _Thread_BSP_context) +
/*threadmp.h*/ (sizeof _Thread_MP_Receive) +

2
cpukit/libmisc/monitor/mon-object.c
View File

@@ -60,7 +60,7 @@ rtems_monitor_object_info_t rtems_monitor_object_info[] =
(rtems_monitor_object_dump_fn) rtems_monitor_init_task_dump,
},
{ RTEMS_OBJECT_TASK,
(void *) &_Thread_Information,
(void *) &_RTEMS_tasks_Information,
sizeof(rtems_monitor_task_t),
(rtems_monitor_object_next_fn) rtems_monitor_manager_next,
(rtems_monitor_object_canonical_fn) rtems_monitor_task_canonical,

26
cpukit/libmisc/stackchk/check.c
View File

@@ -415,9 +415,11 @@ void Stack_check_Fatal_extension( unsigned32 status )
void Stack_check_Dump_usage( void )
{
unsigned32 i;
Thread_Control *the_thread;
unsigned32 hit_running = 0;
unsigned32 i;
unsigned32 class_index;
Thread_Control *the_thread;
unsigned32 hit_running = 0;
Objects_Information *information;
if (stack_check_initialized == 0)
return;
@@ -425,11 +427,19 @@ void Stack_check_Dump_usage( void )
printf(
" ID NAME LOW HIGH AVAILABLE USED\n"
);
for ( i=1 ; i<_Thread_Information.maximum ; i++ ) {
the_thread = (Thread_Control *)_Thread_Information.local_table[ i ];
Stack_check_Dump_threads_usage( the_thread );
if ( the_thread == _Thread_Executing )
hit_running = 1;
for ( class_index = OBJECTS_CLASSES_FIRST ;
class_index <= OBJECTS_CLASSES_LAST ;
class_index++ ) {
information = _Objects_Information_table[ class_index ];
if ( information && information->is_thread ) {
for ( i=1 ; i < information->maximum ; i++ ) {
the_thread = (Thread_Control *)information->local_table[ i ];
Stack_check_Dump_threads_usage( the_thread );
if ( the_thread == _Thread_Executing )
hit_running = 1;
}
}
}
if ( !hit_running )

19
cpukit/rtems/include/rtems/rtems/tasks.h
View File

@@ -61,6 +61,25 @@ extern "C" {
#define RTEMS_YIELD_PROCESSOR RTEMS_NO_TIMEOUT
/*
* The following defines the information control block used to
* manage this class of objects.
*/
EXTERN Objects_Information _RTEMS_tasks_Information;
/*
* _RTEMS_tasks_Manager_initialization
*
* DESCRIPTION:
*
* This routine initializes all Task Manager related data structures.
*/
void _RTEMS_tasks_Manager_initialization(
unsigned32 maximum_tasks
);
/*
* rtems_task_create
*

4
cpukit/rtems/inline/rtems/rtems/tasks.inl
View File

@@ -30,7 +30,7 @@
STATIC INLINE Thread_Control *_RTEMS_tasks_Allocate( void )
{
return (Thread_Control *) _Objects_Allocate( &_Thread_Information );
return (Thread_Control *) _Objects_Allocate( &_RTEMS_tasks_Information );
}
/*PAGE
@@ -43,7 +43,7 @@ STATIC INLINE void _RTEMS_tasks_Free (
Thread_Control *the_task
)
{
_Objects_Free( &_Thread_Information, &the_task->Object );
_Objects_Free( &_RTEMS_tasks_Information, &the_task->Object );
}
/*PAGE

4
cpukit/rtems/macros/rtems/rtems/tasks.inl
View File

@@ -29,7 +29,7 @@
*/
#define _RTEMS_tasks_Allocate() \
(Thread_Control *) _Objects_Allocate( &_Thread_Information )
(Thread_Control *) _Objects_Allocate( &_RTEMS_tasks_Information )
/*PAGE
*
@@ -38,7 +38,7 @@
*/
#define _RTEMS_tasks_Free( _the_task ) \
_Objects_Free( &_Thread_Information, &(_the_task)->Object )
_Objects_Free( &_RTEMS_tasks_Information, &(_the_task)->Object )
/*PAGE
*

3
cpukit/rtems/src/dpmem.c
View File

@@ -43,7 +43,8 @@ void _Dual_ported_memory_Manager_initialization(
maximum_ports,
sizeof( Dual_ported_memory_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
cpukit/rtems/src/msg.c
View File

@@ -51,7 +51,8 @@ void _Message_queue_Manager_initialization(
maximum_message_queues,
sizeof( Message_queue_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
cpukit/rtems/src/part.c
View File

@@ -45,7 +45,8 @@ void _Partition_Manager_initialization(
maximum_partitions,
sizeof( Partition_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
cpukit/rtems/src/ratemon.c
View File

@@ -47,7 +47,8 @@ void _Rate_monotonic_Manager_initialization(
maximum_periods,
sizeof( Rate_monotonic_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
cpukit/rtems/src/region.c
View File

@@ -45,7 +45,8 @@ void _Region_Manager_initialization(
maximum_regions,
sizeof( Region_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
cpukit/rtems/src/rtemstimer.c
View File

@@ -44,7 +44,8 @@ void _Timer_Manager_initialization(
maximum_timers,
sizeof( Timer_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

3
cpukit/rtems/src/sem.c
View File

@@ -62,7 +62,8 @@ void _Semaphore_Manager_initialization(
maximum_semaphores,
sizeof( Semaphore_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

4
cpukit/rtems/src/taskmp.c
View File

@@ -194,7 +194,7 @@ void _RTEMS_tasks_MP_Process_packet (
case RTEMS_TASKS_MP_ANNOUNCE_CREATE:
ignored = _Objects_MP_Open(
&_Thread_Information,
&_RTEMS_tasks_Information,
the_packet->name,
the_packet->Prefix.id,
TRUE
@@ -205,7 +205,7 @@ void _RTEMS_tasks_MP_Process_packet (
case RTEMS_TASKS_MP_ANNOUNCE_DELETE:
_Objects_MP_Close( &_Thread_Information, the_packet->Prefix.id );
_Objects_MP_Close( &_RTEMS_tasks_Information, the_packet->Prefix.id );
_MPCI_Return_packet( the_packet_prefix );
break;

38
cpukit/rtems/src/tasks.c
View File

@@ -26,6 +26,34 @@
#include <rtems/userext.h>
#include <rtems/wkspace.h>
/*PAGE
*
* _RTEMS_tasks_Manager_initialization
*
* This routine initializes all Task Manager related data structures.
*
* Input parameters:
* maximum_tasks - number of tasks to initialize
*
* Output parameters: NONE
*/
void _RTEMS_tasks_Manager_initialization(
unsigned32 maximum_tasks
)
{
_Objects_Initialize_information(
&_RTEMS_tasks_Information,
OBJECTS_RTEMS_TASKS,
TRUE,
maximum_tasks,
sizeof( Thread_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH,
TRUE
);
}
/*PAGE
*
* rtems_task_create
@@ -136,7 +164,7 @@ rtems_status_code rtems_task_create(
the_thread->Start.fp_context = the_thread->fp_context;
if ( _Attributes_Is_global( the_attribute_set ) &&
!( _Objects_MP_Open( &_Thread_Information, name,
!( _Objects_MP_Open( &_RTEMS_tasks_Information, name,
the_thread->Object.id, FALSE ) ) ) {
_RTEMS_tasks_Free( the_thread );
(void) _Workspace_Free( memory );
@@ -157,7 +185,7 @@ rtems_status_code rtems_task_create(
_ASR_Initialize( &the_thread->Signal );
_Objects_Open( &_Thread_Information, &the_thread->Object, &name );
_Objects_Open( &_RTEMS_tasks_Information, &the_thread->Object, &name );
*id = the_thread->Object.id;
@@ -199,7 +227,7 @@ rtems_status_code rtems_task_ident(
)
{
if ( name != OBJECTS_ID_OF_SELF )
return( _Objects_Name_to_id( &_Thread_Information, &name, node, id ) );
return( _Objects_Name_to_id( &_RTEMS_tasks_Information, &name, node, id ) );
*id = _Thread_Executing->Object.id;
return( RTEMS_SUCCESSFUL );
@@ -368,7 +396,7 @@ rtems_status_code rtems_task_delete(
_Thread_Dispatch();
return( RTEMS_ILLEGAL_ON_REMOTE_OBJECT );
case OBJECTS_LOCAL:
_Objects_Close( &_Thread_Information, &the_thread->Object );
_Objects_Close( &_RTEMS_tasks_Information, &the_thread->Object );
_Thread_Set_state( the_thread, STATES_TRANSIENT );
@@ -388,7 +416,7 @@ rtems_status_code rtems_task_delete(
if ( _Attributes_Is_global( the_thread->attribute_set ) ) {
_Objects_MP_Close( &_Thread_Information, the_thread->Object.id );
_Objects_MP_Close( &_RTEMS_tasks_Information, the_thread->Object.id );
_RTEMS_tasks_MP_Send_process_packet(
RTEMS_TASKS_MP_ANNOUNCE_DELETE,

3
cpukit/sapi/src/exinit.c
View File

@@ -152,7 +152,6 @@ rtems_interrupt_level rtems_initialize_executive_early(
_TOD_Handler_initialization( configuration_table->microseconds_per_tick );
_Thread_Handler_initialization(
configuration_table->maximum_tasks,
configuration_table->ticks_per_timeslice,
multiprocessing_table->maximum_proxies
);
@@ -165,6 +164,8 @@ rtems_interrupt_level rtems_initialize_executive_early(
_Multiprocessing_Manager_initialization();
_RTEMS_tasks_Manager_initialization( configuration_table->maximum_tasks );
_Timer_Manager_initialization( configuration_table->maximum_timers );
_Extension_Manager_initialization( configuration_table->maximum_extensions );

3
cpukit/sapi/src/extension.c
View File

@@ -42,7 +42,8 @@ void _Extension_Manager_initialization(
maximum_extensions,
sizeof( Extension_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
RTEMS_MAXIMUM_NAME_LENGTH,
FALSE
);
}

36
cpukit/score/include/rtems/score/object.h
View File

@@ -78,17 +78,21 @@ typedef unsigned32 Objects_Id;
typedef enum {
OBJECTS_NO_CLASS = 0,
OBJECTS_RTEMS_TASKS = 1,
OBJECTS_RTEMS_TIMERS = 2,
OBJECTS_RTEMS_SEMAPHORES = 3,
OBJECTS_RTEMS_MESSAGE_QUEUES = 4,
OBJECTS_RTEMS_PARTITIONS = 5,
OBJECTS_RTEMS_REGIONS = 6,
OBJECTS_RTEMS_PORTS = 7,
OBJECTS_RTEMS_PERIODS = 8,
OBJECTS_RTEMS_EXTENSIONS = 9
OBJECTS_INTERNAL_THREADS = 1,
OBJECTS_RTEMS_TASKS = 2,
OBJECTS_RTEMS_TIMERS = 3,
OBJECTS_RTEMS_SEMAPHORES = 4,
OBJECTS_RTEMS_MESSAGE_QUEUES = 5,
OBJECTS_RTEMS_PARTITIONS = 6,
OBJECTS_RTEMS_REGIONS = 7,
OBJECTS_RTEMS_PORTS = 8,
OBJECTS_RTEMS_PERIODS = 9,
OBJECTS_RTEMS_EXTENSIONS = 10
} Objects_Classes;
#define OBJECTS_CLASSES_FIRST OBJECTS_NO_CLASS
#define OBJECTS_CLASSES_LAST OBJECTS_RTEMS_EXTENSIONS
/*
* This enumerated type lists the locations which may be returned
* by _Objects_Get. These codes indicate the success of locating
@@ -128,6 +132,8 @@ typedef struct {
Chain_Control Inactive; /* chain of inactive ctl blocks */
boolean is_string; /* TRUE if names are strings */
unsigned32 name_length; /* maximum length of names */
boolean is_thread; /* TRUE if these are threads */
/* irregardless of API */
} Objects_Information;
/*
@@ -137,6 +143,15 @@ typedef struct {
EXTERN unsigned32 _Objects_Local_node;
/*
* The following is the list of information blocks for each object
* class. From the ID, we can go to one of these information blocks,
* and obtain a pointer to the appropriate object control block.
*/
EXTERN Objects_Information
*_Objects_Information_table[OBJECTS_CLASSES_LAST + 1];
/*
* The following defines the constant which may be used
* with _Objects_Get to manipulate the calling task.
@@ -201,7 +216,8 @@ void _Objects_Initialize_information (
unsigned32 maximum,
unsigned32 size,
boolean is_string,
unsigned32 maximum_name_length
unsigned32 maximum_name_length,
boolean is_task
);
/*

8
cpukit/score/include/rtems/score/thread.h
View File

@@ -228,13 +228,6 @@ EXTERN Thread_Control *_Thread_Heir;
EXTERN Thread_Control *_Thread_Allocated_fp;
/*
* The following defines the information control block used to
* manage this class of objects.
*/
EXTERN Objects_Information _Thread_Information;
/*
* The following context area contains the context of the "thread"
* which invoked rtems_initialize_executive. This context is restored
@@ -254,7 +247,6 @@ EXTERN Context_Control _Thread_BSP_context;
*/
void _Thread_Handler_initialization (
unsigned32 maximum_tasks,
unsigned32 ticks_per_timeslice,
unsigned32 maximum_proxies
);

29
cpukit/score/inline/rtems/score/thread.inl
View File

@@ -231,6 +231,7 @@ STATIC INLINE boolean _Thread_Is_null (
*
* _Thread_Get
*
* NOTE: XXX... This routine may be able to be optimized.
*/
STATIC INLINE Thread_Control *_Thread_Get (
@@ -238,14 +239,30 @@ STATIC INLINE Thread_Control *_Thread_Get (
Objects_Locations *location
)
{
Objects_Classes the_class;
Objects_Information *information;
if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ) {
_Thread_Disable_dispatch();
*location = OBJECTS_LOCAL;
return( _Thread_Executing );
_Thread_Disable_dispatch();
*location = OBJECTS_LOCAL;
return( _Thread_Executing );
}
return (Thread_Control *)
_Objects_Get( &_Thread_Information, id, location );
the_class = rtems_get_class( id );
if ( the_class > OBJECTS_CLASSES_LAST ) {
*location = OBJECTS_ERROR;
return (Thread_Control *) 0;
}
information = _Objects_Information_table[ the_class ];
if ( !information || !information->is_thread ) {
*location = OBJECTS_ERROR;
return (Thread_Control *) 0;
}
return (Thread_Control *) _Objects_Get( information, id, location );
}
#endif

14
cpukit/score/src/object.c
View File

@@ -68,7 +68,8 @@ void _Objects_Initialize_information(
unsigned32 maximum,
unsigned32 size,
boolean is_string,
unsigned32 maximum_name_length
unsigned32 maximum_name_length,
boolean is_thread
)
{
unsigned32 minimum_index;
@@ -80,6 +81,13 @@ void _Objects_Initialize_information(
information->maximum = maximum;
information->the_class = the_class;
information->is_string = is_string;
information->is_thread = is_thread;
/*
* Set the entry in the object information table.
*/
_Objects_Information_table[ the_class ] = information;
/*
* Calculate minimum and maximum Id's
@@ -379,8 +387,8 @@ rtems_status_code _Objects_Name_to_id(
Objects_Control *_Objects_Get(
Objects_Information *information,
Objects_Id id,
Objects_Locations *location
Objects_Id id,
Objects_Locations *location
)
{
Objects_Control *the_object;

47
cpukit/score/src/thread.c
View File

@@ -35,14 +35,13 @@
* This routine initializes all thread manager related data structures.
*
* Input parameters:
* maximum_tasks - number of tasks to initialize
* ticks_per_timeslice - clock ticks per quantum
* maximum_proxies - number of proxies to initialize
*
* Output parameters: NONE
*/
void _Thread_Handler_initialization(
unsigned32 maximum_tasks,
unsigned32 ticks_per_timeslice,
unsigned32 maximum_proxies
)
@@ -57,16 +56,6 @@ void _Thread_Handler_initialization(
_Thread_Ticks_remaining_in_timeslice = ticks_per_timeslice;
_Thread_Ticks_per_timeslice = ticks_per_timeslice;
_Objects_Initialize_information(
&_Thread_Information,
OBJECTS_RTEMS_TASKS,
TRUE,
maximum_tasks,
sizeof( Thread_Control ),
FALSE,
RTEMS_MAXIMUM_NAME_LENGTH
);
_Thread_Ready_chain = _Workspace_Allocate_or_fatal_error(
(RTEMS_MAXIMUM_PRIORITY + 1) * sizeof(Chain_Control)
);
@@ -789,22 +778,40 @@ boolean _Thread_Change_mode(
*
* NOTE: If we are not using static inlines, this must be a real
* subroutine call.
*
* NOTE: XXX... This routine may be able to be optimized.
*/
#ifndef USE_INLINES
STATIC INLINE Thread_Control *_Thread_Get (
Objects_Id id,
Objects_Locations *location
Objects_Id id,
Objects_Locations *location
)
{
Objects_Classes the_class;
Objects_Information *information;
if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ) {
_Thread_Disable_dispatch();
*location = OBJECTS_LOCAL;
return( _Thread_Executing );
_Thread_Disable_dispatch();
*location = OBJECTS_LOCAL;
return( _Thread_Executing );
}
return (Thread_Control *) _Objects_Get( &_Thread_Information, id, location );
the_class = rtems_get_class( id );
if ( the_class > OBJECTS_CLASSES_LAST ) {
*location = OBJECTS_ERROR;
return (Thread_Control *) 0;
}
information = _Objects_Information_table[ the_class ];
if ( !information || !information->is_thread ) {
*location = OBJECTS_ERROR;
return (Thread_Control *) 0;
}
return (Thread_Control *) _Objects_Get( information, id, location );
}
#endif

4
testsuites/sptests/sp02/sp02.scn
View File

@@ -5,8 +5,8 @@ INIT - suspending TA2 while middle task on a ready chain
TA1 - rtems_task_wake_after - sleep 1 second
TA2 - rtems_task_wake_after - sleep 1 minute
TA3 - rtems_task_wake_after - sleep 5 seconds
TA1 - rtems_task_ident - tid of TA2 (0x04010007)
TA1 - rtems_task_ident - tid of TA3 (0x04010008)
TA1 - rtems_task_ident - tid of TA2 (0x08010007)
TA1 - rtems_task_ident - tid of TA3 (0x08010008)
TA1 - rtems_task_set_priority - set TA3's priority to 2
TA1 - rtems_task_suspend - suspend TA2
TA1 - rtems_task_delete - delete TA2

2
testsuites/sptests/sp12/sp12.scn
View File

@@ -35,7 +35,7 @@ PRI5 - rtems_semaphore_release - nested
PRI5 - rtems_semaphore_release - restore priority
PRI5 - priority of PRI5 is 68
<pause>
TA1 - rtems_semaphore_ident - smid => 0c010001
TA1 - rtems_semaphore_ident - smid => 10010001
TA1 - rtems_semaphore_obtain - wait forever on SM2
TA1 - got SM2
TA1 - rtems_semaphore_obtain - wait forever on SM3

2
testsuites/sptests/sp13/sp13.scn
View File

@@ -1,5 +1,5 @@
*** TEST 13 ***
TA1 - rtems_message_queue_ident - qid => 10010001
TA1 - rtems_message_queue_ident - qid => 14010001
TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1
TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1
TA1 - rtems_task_wake_after - sleep 5 seconds

4
testsuites/sptests/sp15/sp15.scn
View File

@@ -1,8 +1,8 @@
*** TEST 15 ***
INIT - rtems_partition_create - partition 1
INIT - rtems_partition_create - partition 2
TA1 - rtems_partition_ident - partition 1 id = 14010001
TA1 - rtems_partition_ident - partition 2 id = 14010002
TA1 - rtems_partition_ident - partition 1 id = 18010001
TA1 - rtems_partition_ident - partition 2 id = 18010002
TA1 - rtems_partition_get_buffer - buffer 1 from partition 1 - 0x00000000
TA1 - rtems_partition_get_buffer - buffer 2 from partition 1 - 0x00000200
TA1 - rtems_partition_get_buffer - buffer 1 from partition 2 - 0x00000000

2
testsuites/sptests/sp16/sp16.scn
View File

@@ -1,5 +1,5 @@
*** TEST 16 ***
TA1 - rtems_region_ident - rnid => 18010002
TA1 - rtems_region_ident - rnid => 1c010002
TA1 - rtems_region_get_segment - wait on 100 byte segment from region 2
TA1 - got segment from region 2 - 0x00000f78
TA1 - rtems_region_get_segment - wait on 3K segment from region 3

30
testsuites/sptests/sp20/sp20.scn
View File

@@ -1,19 +1,19 @@
*** TEST 20 ***
TA1 - rtems_rate_monotonic_create id = 0x20010001
TA1 - rtems_rate_monotonic_ident id = 0x20010001
TA1 - (0x20010001) period 2
TA2 - rtems_rate_monotonic_create id = 0x20010002
TA2 - rtems_rate_monotonic_ident id = 0x20010002
TA2 - (0x20010002) period 2
TA3 - rtems_rate_monotonic_create id = 0x20010003
TA3 - rtems_rate_monotonic_ident id = 0x20010003
TA3 - (0x20010003) period 2
TA4 - rtems_rate_monotonic_create id = 0x20010004
TA4 - rtems_rate_monotonic_ident id = 0x20010004
TA4 - (0x20010004) period 2
TA5 - rtems_rate_monotonic_create id = 0x20010005
TA5 - rtems_rate_monotonic_ident id = 0x20010005
TA5 - (0x20010005) period 100
TA1 - rtems_rate_monotonic_create id = 0x24010001
TA1 - rtems_rate_monotonic_ident id = 0x24010001
TA1 - (0x24010001) period 2
TA2 - rtems_rate_monotonic_create id = 0x24010002
TA2 - rtems_rate_monotonic_ident id = 0x24010002
TA2 - (0x24010002) period 2
TA3 - rtems_rate_monotonic_create id = 0x24010003
TA3 - rtems_rate_monotonic_ident id = 0x24010003
TA3 - (0x24010003) period 2
TA4 - rtems_rate_monotonic_create id = 0x24010004
TA4 - rtems_rate_monotonic_ident id = 0x24010004
TA4 - (0x24010004) period 2
TA5 - rtems_rate_monotonic_create id = 0x24010005
TA5 - rtems_rate_monotonic_ident id = 0x24010005
TA5 - (0x24010005) period 100
TA5 - PERIODS CHECK OK (1)
TA5 - PERIODS CHECK OK (2)
TA5 - PERIODS CHECK OK (3)

4
testsuites/sptests/sp22/sp22.scn
View File

@@ -1,8 +1,8 @@
*** TEST 22 ***
INIT - rtems_timer_create - creating timer 1
INIT - timer 1 has id (0x8010001)
INIT - timer 1 has id (0xc010001)
TA1 - rtems_timer_ident - identing timer 1
TA1 - timer 1 has id (0x8010001)
TA1 - timer 1 has id (0xc010001)
TA1 - rtems_clock_get - 09:00:00 12/31/1988
TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
TA1 - rtems_task_suspend( RTEMS_SELF )

2
testsuites/sptests/sp23/sp23.scn
View File

@@ -1,6 +1,6 @@
*** TEST 23 ***
INIT - rtems_port_create - DP1 - int = 0x00001000 ext = 0x00002000
TA1 - rtems_port_ident - 00010001
TA1 - rtems_port_ident - 0x20010001
TA1 - rtems_port_external_to_internal - 0x0000200e => 0x0000100e
TA1 - rtems_port_internal_to_external - 0x0000100e => 0x0000200e
TA1 - rtems_port_external_to_internal - 0x0000300e => 0x0000300e

2
testsuites/sptests/sp23/task1.c
View File

@@ -33,7 +33,7 @@ rtems_task Task_1(
status = rtems_port_ident( Port_name[ 1 ], &dpid );
directive_failed( status, "rtems_port_ident" );
printf( "TA1 - rtems_port_ident - %08x\n", dpid );
printf( "TA1 - rtems_port_ident - 0x%08x\n", dpid );
to_be_converted = &External_port_area[ 0xe ];
status = rtems_port_external_to_internal(

2
testsuites/sptests/sp25/sp25.scn
View File

@@ -1,5 +1,5 @@
*** TEST 25 ***
TA1 - rtems_region_ident - 0x18010002
TA1 - rtems_region_ident - 0x1c010002
TA1 - rtems_region_get_segment - wait on 64 byte segment from region 1
TA1 - got segment from region 1 - 0x0000f9b8
TA1 - rtems_region_get_segment - wait on 128 byte segment from region 1

3
testsuites/sptests/spsize/size.c
View File

@@ -295,7 +295,7 @@ uninitialized =
/*taskmp.h*/ 0 +
/*tasks.h*/ 0 +
/*tasks.h*/ (sizeof _RTEMS_tasks_Information) +
/*thread.h*/ (sizeof _Thread_Dispatch_disable_level) +
(sizeof _Thread_Ticks_remaining_in_timeslice) +
@@ -304,7 +304,6 @@ uninitialized =
(sizeof _Thread_Executing) +
(sizeof _Thread_Heir) +
(sizeof _Thread_Allocated_fp) +
(sizeof _Thread_Information) +
(sizeof _Thread_BSP_context) +
/*threadmp.h*/ (sizeof _Thread_MP_Receive) +