Changeset 2345d61b in rtems


Ignore:
Timestamp:
Jan 24, 2008, 3:12:09 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.9, master
Children:
90f6ea62
Parents:
f3a5a20c
Message:

2008-01-24 Joel Sherrill <joel.sherrill@…>

  • score/include/rtems/score/object.h, score/src/objectextendinformation.c, score/src/objectinitializeinformation.c, score/src/objectshrinkinformation.c: Eliminate name_table since it is not used.
Location:
cpukit
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rf3a5a20c r2345d61b  
     12008-01-24      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * score/include/rtems/score/object.h,
     4        score/src/objectextendinformation.c,
     5        score/src/objectinitializeinformation.c,
     6        score/src/objectshrinkinformation.c: Eliminate name_table since it is
     7        not used.
     8
    192008-01-23      Joel Sherrill <joel.sherrill@oarcorp.com>
    210
  • cpukit/score/include/rtems/score/object.h

    rf3a5a20c r2345d61b  
    342342  /** This points to the table of local objects. */
    343343  Objects_Control **local_table;
    344   /** This points to the table of local object names. */
    345   /* XXX should be safe to remove this field */
    346   uint32_t        **name_table;
    347344  /** This is the chain of inactive control blocks. */
    348345  Chain_Control     Inactive;
  • cpukit/score/src/objectextendinformation.c

    rf3a5a20c r2345d61b  
    4848{
    4949  Objects_Control  *the_object;
    50   void             *name_area;
    5150  Chain_Control     Inactive;
    5251  uint32_t          block_count;
     
    8584    ISR_Level         level;
    8685    void            **object_blocks;
    87     void            **name_table;
    8886    uint32_t         *inactive_per_block;
    8987    Objects_Control **local_table;
     
    102100     *      void            *objects[block_count];
    103101     *      uint32_t         inactive_count[block_count];
    104      *      Objects_Name    *name_table[block_count];
    105102     *      Objects_Control *local_table[maximum];
    106103     *
     
    136133        _Workspace_Allocate_or_fatal_error(
    137134          block_count *
    138              (sizeof(void *) + sizeof(uint32_t  ) + sizeof(Objects_Name *)) +
     135             (sizeof(void *) + sizeof(uint32_t) + sizeof(Objects_Name *)) +
    139136          ((maximum + minimum_index) * sizeof(Objects_Control *))
    140137        );
     
    148145    inactive_per_block = (uint32_t   *) _Addresses_Add_offset(
    149146        object_blocks, block_count * sizeof(void*) );
    150     name_table = (void *) _Addresses_Add_offset(
    151         inactive_per_block, block_count * sizeof(uint32_t  ) );
    152147    local_table = (Objects_Control **) _Addresses_Add_offset(
    153         name_table, block_count * sizeof(Objects_Name *) );
     148        inactive_per_block, block_count * sizeof(uint32_t) );
    154149
    155150    /*
     
    173168              information->inactive_per_block,
    174169              block_count * sizeof(uint32_t  ) );
    175       memcpy( name_table,
    176               information->name_table,
    177               block_count * sizeof(Objects_Name *) );
    178170      memcpy( local_table,
    179171              information->local_table,
     
    196188    object_blocks[block_count] = NULL;
    197189    inactive_per_block[block_count] = 0;
    198     // name_table[block_count] = NULL;
    199190
    200191    for ( index=index_base ;
     
    210201    information->object_blocks = object_blocks;
    211202    information->inactive_per_block = inactive_per_block;
    212     information->name_table = (void *)name_table;
    213203    information->local_table = local_table;
    214204    information->maximum = maximum;
     
    250240  }
    251241
    252   name_area = (Objects_Name *) _Addresses_Add_offset(
    253     information->object_blocks[ block ],
    254     (information->allocation_size * information->size)
    255   );
    256   // information->name_table[ block ] = name_area;
    257 
    258242  /*
    259243   *  Initialize objects .. add to a local chain first.
     
    282266      );
    283267
    284     name_area = (void *)_Addresses_Add_offset( name_area, information->name_length );
    285 
    286268    _Chain_Append( &information->Inactive, &the_object->Node );
    287269
  • cpukit/score/src/objectinitializeinformation.c

    rf3a5a20c r2345d61b  
    7575
    7676  information->local_table        = 0;
    77   information->name_table         = 0;
    7877  information->inactive_per_block = 0;
    7978  information->object_blocks      = 0;
  • cpukit/score/src/objectshrinkinformation.c

    rf3a5a20c r2345d61b  
    106106
    107107      _Workspace_Free( information->object_blocks[ block ] );
    108       information->name_table[ block ] = NULL;
    109108      information->object_blocks[ block ] = NULL;
    110109      information->inactive_per_block[ block ] = 0;
Note: See TracChangeset for help on using the changeset viewer.