Changeset def9eef in rtems


Ignore:
Timestamp:
Jan 28, 2008, 5:19:01 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.9, master
Children:
5fdb1e7b
Parents:
81f5957
Message:

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

  • sapi/include/confdefs.h, score/src/mpci.c, score/src/objectmp.c, score/src/objectnametoid.c, score/src/objectnametoidstring.c: Multiprocessing compiles again and survives initialization. The recent object name and confdefs.h changes had broken it.
Location:
cpukit
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r81f5957 rdef9eef  
     12008-01-28      Joel Sherrill <joel.sherrill@OARcorp.com>
     2
     3        * sapi/include/confdefs.h, score/src/mpci.c, score/src/objectmp.c,
     4        score/src/objectnametoid.c, score/src/objectnametoidstring.c:
     5        Multiprocessing compiles again and survives initialization. The
     6        recent object name and confdefs.h changes had broken it.
     7
    182008-01-25      Jennifer Averett <jennifer.averett@OARcorp.com>
    29
  • cpukit/sapi/include/confdefs.h

    r81f5957 rdef9eef  
    526526#endif
    527527
     528#ifndef CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK
     529#define CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK 0
     530#endif
     531
    528532#ifndef CONFIGURE_MP_MPCI_TABLE_POINTER
    529533#include <mpci.h>
     
    533537#ifdef CONFIGURE_INIT
    534538rtems_multiprocessing_table Multiprocessing_configuration = {
    535   CONFIGURE_MP_NODE_NUMBER,              /* local node number */
    536   CONFIGURE_MP_MAXIMUM_NODES,            /* maximum # nodes in system */
    537   CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS,   /* maximum # global objects */
    538   CONFIGURE_MP_MAXIMUM_PROXIES,          /* maximum # proxies */
    539   CONFIGURE_MP_MPCI_TABLE_POINTER        /* pointer to MPCI config table */
     539  CONFIGURE_MP_NODE_NUMBER,                  /* local node number */
     540  CONFIGURE_MP_MAXIMUM_NODES,                /* maximum # nodes in system */
     541  CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS,       /* maximum # global objects */
     542  CONFIGURE_MP_MAXIMUM_PROXIES,              /* maximum # proxies */
     543  CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK, /* MPCI task stack > minimum */
     544  CONFIGURE_MP_MPCI_TABLE_POINTER            /* pointer to MPCI config table */
    540545};
    541546#endif
     
    10971102  ( CONFIGURE_MEMORY_FOR_PROXIES(CONFIGURE_MP_MAXIMUM_PROXIES) + \
    10981103    CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS) + \
    1099     CONFIGURE_MEMORY_FOR_TASKS(1) \
     1104    CONFIGURE_MEMORY_FOR_TASKS(1) + \
     1105    CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK \
    11001106  )
    11011107
  • cpukit/score/src/mpci.c

    r81f5957 rdef9eef  
    9696 */
    9797
    98 char *_MPCI_Internal_name = "MPCI";
    99 
    10098void _MPCI_Create_server( void )
    10199{
     100  Objects_Name name;
     101
    102102
    103103  if ( !_System_state_Is_multiprocessing )
     
    110110  _MPCI_Receive_server_tcb = _Thread_Internal_allocate();
    111111
     112  name.name_u32 = _Objects_Build_name( 'M', 'P', 'C', 'I' );
    112113  _Thread_Initialize(
    113114    &_Thread_Internal_information,
     
    123124    NULL,        /* no budget algorithm callout */
    124125    0,           /* all interrupts enabled */
    125     _MPCI_Internal_name
     126    name
    126127  );
    127128
  • cpukit/score/src/objectmp.c

    r81f5957 rdef9eef  
    170170  uint32_t            name_to_use;
    171171
    172   name_to_use = (uint32_t)the_name;  /* XXX only fixed length names */
     172  name_to_use = the_name.name_u32;  /* XXX only fixed length names */
    173173
    174174  if ( nodes_to_search > _Objects_Maximum_nodes )
  • cpukit/score/src/objectnametoid.c

    r81f5957 rdef9eef  
    5959  uint32_t                   index;
    6060  uint32_t                   name_length;
     61#if defined(RTEMS_MULTIPROCESSING)
     62  Objects_Name               name_for_mp;
     63#endif
    6164
    6265  /* ASSERT: information->is_string == FALSE */
     
    9699    return OBJECTS_INVALID_NAME;
    97100
    98   return ( _Objects_MP_Global_name_search( information, name, node, id ) );
     101  name_for_mp.name_u32 = name;
     102  return _Objects_MP_Global_name_search( information, name_for_mp, node, id );
    99103#else
    100104  return OBJECTS_INVALID_NAME;
  • cpukit/score/src/objectnametoidstring.c

    r81f5957 rdef9eef  
    6161  uint32_t                   index;
    6262  uint32_t                   name_length;
     63#if defined(RTEMS_MULTIPROCESSING)
     64  Objects_Name               name_for_mp;
     65#endif
    6366
    6467  /* ASSERT: information->is_string == TRUE */
     
    101104    return OBJECTS_INVALID_NAME;
    102105
    103   return ( _Objects_MP_Global_name_search( information, name, node, id ) );
     106  name_for_mp.name_p = name;
     107  return _Objects_MP_Global_name_search( information, name_for_mp, node, id );
    104108#else
    105109  return OBJECTS_INVALID_NAME;
Note: See TracChangeset for help on using the changeset viewer.