Changeset 9863dbf in rtems


Ignore:
Timestamp:
Aug 18, 1995, 9:42:58 PM (25 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
0f592fba
Parents:
95fbca1
Message:

+ Added object type field to object id.

+ Added name pointer to Object_Control.

+ Modified Object Open and Close to address name field.

+ Removed name as separate element from Thread and Proxy Control.

+ Added parameter "object class" to calls to Initialize Information

Files:
26 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/rtems/src/dpmem.c

    r95fbca1 r9863dbf  
    3838  _Objects_Initialize_information(
    3939     &_Dual_ported_memory_Information,
     40     OBJECTS_RTEMS_PORTS,
    4041     FALSE,
    4142     maximum_ports,
  • c/src/exec/rtems/src/msg.c

    r95fbca1 r9863dbf  
    4646  _Objects_Initialize_information(
    4747    &_Message_queue_Information,
     48    OBJECTS_RTEMS_MESSAGE_QUEUES,
    4849    TRUE,
    4950    maximum_message_queues,
     
    286287          the_message_queue->Object.id,
    287288          0,                                 /* Not used */
    288           MPCI_DEFAULT_TIMEOUT
     289          0
    289290        );
    290291      }
  • c/src/exec/rtems/src/part.c

    r95fbca1 r9863dbf  
    4040  _Objects_Initialize_information(
    4141    &_Partition_Information,
     42    OBJECTS_RTEMS_PARTITIONS,
    4243    TRUE,
    4344    maximum_partitions,
  • c/src/exec/rtems/src/ratemon.c

    r95fbca1 r9863dbf  
    4242  _Objects_Initialize_information(
    4343     &_Rate_monotonic_Information,
     44     OBJECTS_RTEMS_PERIODS,
    4445     FALSE,
    4546     maximum_periods,
  • c/src/exec/rtems/src/region.c

    r95fbca1 r9863dbf  
    4040  _Objects_Initialize_information(
    4141     &_Region_Information,
     42     OBJECTS_RTEMS_REGIONS,
    4243     FALSE,
    4344     maximum_regions,
  • c/src/exec/rtems/src/rtemstimer.c

    r95fbca1 r9863dbf  
    3939  _Objects_Initialize_information(
    4040     &_Timer_Information,
     41     OBJECTS_RTEMS_TIMERS,
    4142     FALSE,
    4243     maximum_timers,
  • c/src/exec/rtems/src/sem.c

    r95fbca1 r9863dbf  
    5757  _Objects_Initialize_information(
    5858    &_Semaphore_Information,
     59     OBJECTS_RTEMS_SEMAPHORES,
    5960    TRUE,
    6061    maximum_semaphores,
  • c/src/exec/rtems/src/tasks.c

    r95fbca1 r9863dbf  
    144144  }
    145145
    146   the_thread->name                   = name;
    147146  the_thread->attribute_set          = the_attribute_set;
    148147  the_thread->current_state          = STATES_DORMANT;
  • c/src/exec/rtems/src/timer.c

    r95fbca1 r9863dbf  
    3939  _Objects_Initialize_information(
    4040     &_Timer_Information,
     41     OBJECTS_RTEMS_TIMERS,
    4142     FALSE,
    4243     maximum_timers,
  • c/src/exec/sapi/src/extension.c

    r95fbca1 r9863dbf  
    3737  _Objects_Initialize_information(
    3838     &_Extension_Information,
     39     OBJECTS_RTEMS_EXTENSIONS,
    3940     FALSE,
    4041     maximum_extensions,
  • c/src/exec/score/src/object.c

    r95fbca1 r9863dbf  
    5252 *
    5353 *  Input parameters:
    54  *    information     - object class
     54 *    information     - object information table
     55 *    the_class       - object class
    5556 *    supports_global - TRUE if this is a global object class
    5657 *    maximum         - maximum objects of this class
     
    6263void _Objects_Initialize_information(
    6364  Objects_Information *information,
    64   boolean                     supports_global,
    65   unsigned32                  maximum,
    66   unsigned32                  size
     65  Objects_Classes      the_class,
     66  boolean              supports_global,
     67  unsigned32           maximum,
     68  unsigned32           size
    6769)
    6870{
     
    7173  Objects_Control *the_object;
    7274
    73   information->maximum = maximum;
     75  information->maximum   = maximum;
     76  information->the_class = the_class;
    7477
    7578  if ( maximum == 0 ) minimum_index = 0;
     
    7780
    7881  information->minimum_id =
    79     _Objects_Build_id( _Objects_Local_node, minimum_index );
     82    _Objects_Build_id( the_class, _Objects_Local_node, minimum_index );
    8083
    8184  information->maximum_id =
    82     _Objects_Build_id( _Objects_Local_node, maximum );
     85    _Objects_Build_id( the_class, _Objects_Local_node, maximum );
    8386
    8487  information->local_table = _Workspace_Allocate_or_fatal_error(
     
    111114          index <= maximum ;
    112115          index++ ) {
    113       the_object->id = _Objects_Build_id( _Objects_Local_node, index );
     116      the_object->id =
     117        _Objects_Build_id( the_class, _Objects_Local_node, index );
    114118      the_object = (Objects_Control *) the_object->Node.next;
    115119    }
     
    173177         )
    174178      if ( name == names[ index ] ) {
    175         *id = _Objects_Build_id( _Objects_Local_node, index );
     179        *id = _Objects_Build_id(
     180          information->the_class,
     181          _Objects_Local_node,
     182          index
     183        );
    176184        return( RTEMS_SUCCESSFUL );
    177185      }
     
    214222
    215223  index = id - information->minimum_id;
     224
    216225  if ( information->maximum >= index ) {
    217226    _Thread_Disable_dispatch();
     
    274283    do {
    275284        /* walked off end of list? */
    276         if (next_id > information->maximum_id)
     285        if (rtems_get_index(next_id) > information->maximum)
    277286        {
    278287            *location_p = OBJECTS_ERROR;
  • c/src/exec/score/src/thread.c

    r95fbca1 r9863dbf  
    6060  _Objects_Initialize_information(
    6161     &_Thread_Information,
     62     OBJECTS_RTEMS_TASKS,
    6263     TRUE,
    6364     maximum_tasks,
  • c/src/lib/libmisc/monitor/mon-object.c

    r95fbca1 r9863dbf  
    121121#if 0
    122122        /* XXX Uncomment this when types are added to id's */
    123         if (rtems_get_type(id) != RTEMS_OBJECT_INVALID)
    124             type = rtems_get_type(id);
     123        if (rtems_get_class(id) != OBJECTS_NO_CLASS)
     124            type = rtems_get_class(id);
    125125
    126126        id = _Objects_Build_id(type, default_node, rtems_get_index(id));
    127127#else
    128         id = _Objects_Build_id(default_node, rtems_get_index(id));
     128#warning "TONY... FIX ME!!!!!"
     129#if defined(hppa1_1)
     130#error "TONY... I SAID TO FIX ME!!!!!  <HAHAHAHAHA>"
     131#endif
     132        id = _Objects_Build_id(0, default_node, rtems_get_index(id));
    129133#endif
    130134    }
  • c/src/libmisc/monitor/mon-object.c

    r95fbca1 r9863dbf  
    121121#if 0
    122122        /* XXX Uncomment this when types are added to id's */
    123         if (rtems_get_type(id) != RTEMS_OBJECT_INVALID)
    124             type = rtems_get_type(id);
     123        if (rtems_get_class(id) != OBJECTS_NO_CLASS)
     124            type = rtems_get_class(id);
    125125
    126126        id = _Objects_Build_id(type, default_node, rtems_get_index(id));
    127127#else
    128         id = _Objects_Build_id(default_node, rtems_get_index(id));
     128#warning "TONY... FIX ME!!!!!"
     129#if defined(hppa1_1)
     130#error "TONY... I SAID TO FIX ME!!!!!  <HAHAHAHAHA>"
     131#endif
     132        id = _Objects_Build_id(0, default_node, rtems_get_index(id));
    129133#endif
    130134    }
  • cpukit/libmisc/monitor/mon-object.c

    r95fbca1 r9863dbf  
    121121#if 0
    122122        /* XXX Uncomment this when types are added to id's */
    123         if (rtems_get_type(id) != RTEMS_OBJECT_INVALID)
    124             type = rtems_get_type(id);
     123        if (rtems_get_class(id) != OBJECTS_NO_CLASS)
     124            type = rtems_get_class(id);
    125125
    126126        id = _Objects_Build_id(type, default_node, rtems_get_index(id));
    127127#else
    128         id = _Objects_Build_id(default_node, rtems_get_index(id));
     128#warning "TONY... FIX ME!!!!!"
     129#if defined(hppa1_1)
     130#error "TONY... I SAID TO FIX ME!!!!!  <HAHAHAHAHA>"
     131#endif
     132        id = _Objects_Build_id(0, default_node, rtems_get_index(id));
    129133#endif
    130134    }
  • cpukit/rtems/src/dpmem.c

    r95fbca1 r9863dbf  
    3838  _Objects_Initialize_information(
    3939     &_Dual_ported_memory_Information,
     40     OBJECTS_RTEMS_PORTS,
    4041     FALSE,
    4142     maximum_ports,
  • cpukit/rtems/src/msg.c

    r95fbca1 r9863dbf  
    4646  _Objects_Initialize_information(
    4747    &_Message_queue_Information,
     48    OBJECTS_RTEMS_MESSAGE_QUEUES,
    4849    TRUE,
    4950    maximum_message_queues,
     
    286287          the_message_queue->Object.id,
    287288          0,                                 /* Not used */
    288           MPCI_DEFAULT_TIMEOUT
     289          0
    289290        );
    290291      }
  • cpukit/rtems/src/part.c

    r95fbca1 r9863dbf  
    4040  _Objects_Initialize_information(
    4141    &_Partition_Information,
     42    OBJECTS_RTEMS_PARTITIONS,
    4243    TRUE,
    4344    maximum_partitions,
  • cpukit/rtems/src/ratemon.c

    r95fbca1 r9863dbf  
    4242  _Objects_Initialize_information(
    4343     &_Rate_monotonic_Information,
     44     OBJECTS_RTEMS_PERIODS,
    4445     FALSE,
    4546     maximum_periods,
  • cpukit/rtems/src/region.c

    r95fbca1 r9863dbf  
    4040  _Objects_Initialize_information(
    4141     &_Region_Information,
     42     OBJECTS_RTEMS_REGIONS,
    4243     FALSE,
    4344     maximum_regions,
  • cpukit/rtems/src/rtemstimer.c

    r95fbca1 r9863dbf  
    3939  _Objects_Initialize_information(
    4040     &_Timer_Information,
     41     OBJECTS_RTEMS_TIMERS,
    4142     FALSE,
    4243     maximum_timers,
  • cpukit/rtems/src/sem.c

    r95fbca1 r9863dbf  
    5757  _Objects_Initialize_information(
    5858    &_Semaphore_Information,
     59     OBJECTS_RTEMS_SEMAPHORES,
    5960    TRUE,
    6061    maximum_semaphores,
  • cpukit/rtems/src/tasks.c

    r95fbca1 r9863dbf  
    144144  }
    145145
    146   the_thread->name                   = name;
    147146  the_thread->attribute_set          = the_attribute_set;
    148147  the_thread->current_state          = STATES_DORMANT;
  • cpukit/sapi/src/extension.c

    r95fbca1 r9863dbf  
    3737  _Objects_Initialize_information(
    3838     &_Extension_Information,
     39     OBJECTS_RTEMS_EXTENSIONS,
    3940     FALSE,
    4041     maximum_extensions,
  • cpukit/score/src/object.c

    r95fbca1 r9863dbf  
    5252 *
    5353 *  Input parameters:
    54  *    information     - object class
     54 *    information     - object information table
     55 *    the_class       - object class
    5556 *    supports_global - TRUE if this is a global object class
    5657 *    maximum         - maximum objects of this class
     
    6263void _Objects_Initialize_information(
    6364  Objects_Information *information,
    64   boolean                     supports_global,
    65   unsigned32                  maximum,
    66   unsigned32                  size
     65  Objects_Classes      the_class,
     66  boolean              supports_global,
     67  unsigned32           maximum,
     68  unsigned32           size
    6769)
    6870{
     
    7173  Objects_Control *the_object;
    7274
    73   information->maximum = maximum;
     75  information->maximum   = maximum;
     76  information->the_class = the_class;
    7477
    7578  if ( maximum == 0 ) minimum_index = 0;
     
    7780
    7881  information->minimum_id =
    79     _Objects_Build_id( _Objects_Local_node, minimum_index );
     82    _Objects_Build_id( the_class, _Objects_Local_node, minimum_index );
    8083
    8184  information->maximum_id =
    82     _Objects_Build_id( _Objects_Local_node, maximum );
     85    _Objects_Build_id( the_class, _Objects_Local_node, maximum );
    8386
    8487  information->local_table = _Workspace_Allocate_or_fatal_error(
     
    111114          index <= maximum ;
    112115          index++ ) {
    113       the_object->id = _Objects_Build_id( _Objects_Local_node, index );
     116      the_object->id =
     117        _Objects_Build_id( the_class, _Objects_Local_node, index );
    114118      the_object = (Objects_Control *) the_object->Node.next;
    115119    }
     
    173177         )
    174178      if ( name == names[ index ] ) {
    175         *id = _Objects_Build_id( _Objects_Local_node, index );
     179        *id = _Objects_Build_id(
     180          information->the_class,
     181          _Objects_Local_node,
     182          index
     183        );
    176184        return( RTEMS_SUCCESSFUL );
    177185      }
     
    214222
    215223  index = id - information->minimum_id;
     224
    216225  if ( information->maximum >= index ) {
    217226    _Thread_Disable_dispatch();
     
    274283    do {
    275284        /* walked off end of list? */
    276         if (next_id > information->maximum_id)
     285        if (rtems_get_index(next_id) > information->maximum)
    277286        {
    278287            *location_p = OBJECTS_ERROR;
  • cpukit/score/src/thread.c

    r95fbca1 r9863dbf  
    6060  _Objects_Initialize_information(
    6161     &_Thread_Information,
     62     OBJECTS_RTEMS_TASKS,
    6263     TRUE,
    6364     maximum_tasks,
Note: See TracChangeset for help on using the changeset viewer.