From 6ca6ef40cf0baefa0dd4e87404d1de9881d5f6a1 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 1 Nov 2004 16:35:42 +0000 Subject: 2004-11-01 Joel Sherrill * libmisc/monitor/mon-manager.c, libmisc/monitor/mon-object.c: Remove references to _Object_Is_local in single processor configurations. --- cpukit/ChangeLog | 5 ++++ cpukit/libmisc/monitor/mon-manager.c | 6 ++++- cpukit/libmisc/monitor/mon-object.c | 45 ++++++++++++++++++++---------------- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 89addb9c4f..07b26706a4 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2004-11-01 Joel Sherrill + + * libmisc/monitor/mon-manager.c, libmisc/monitor/mon-object.c: Remove + references to _Object_Is_local in single processor configurations. + 2004-11-01 Joel Sherrill * score/src/coresemsurrender.c, score/src/objectnametoid.c: All diff --git a/cpukit/libmisc/monitor/mon-manager.c b/cpukit/libmisc/monitor/mon-manager.c index 7e7a269cd6..3a405608fb 100644 --- a/cpukit/libmisc/monitor/mon-manager.c +++ b/cpukit/libmisc/monitor/mon-manager.c @@ -34,8 +34,10 @@ rtems_monitor_manager_next( * When we are called, it must be local */ - if ( ! _Objects_Is_local_id(*next_id)) +#if defined(RTEMS_MULTIPROCESSING) + if ( ! _Objects_Is_local_id(*next_id) ) goto done; +#endif object = _Objects_Get_next(table, *next_id, &location, next_id); @@ -49,6 +51,8 @@ rtems_monitor_manager_next( _Objects_Copy_name_raw(&object->name, ©->name, sizeof(copy->name)); } +#if defined(RTEMS_MULTIPROCESSING) done: +#endif return object; } diff --git a/cpukit/libmisc/monitor/mon-object.c b/cpukit/libmisc/monitor/mon-object.c index 4428234220..3e714fa35c 100644 --- a/cpukit/libmisc/monitor/mon-object.c +++ b/cpukit/libmisc/monitor/mon-object.c @@ -203,28 +203,33 @@ rtems_monitor_object_canonical_next( void *canonical ) { - rtems_id next_id; - void *raw_item; + rtems_id next_id; + void *raw_item; - if ( ! _Objects_Is_local_id(id)) - next_id = rtems_monitor_object_canonical_next_remote(info->type, - id, - canonical); - else +#if defined(RTEMS_MULTIPROCESSING) + if ( ! _Objects_Is_local_id(id) ) { + next_id = rtems_monitor_object_canonical_next_remote( + info->type, + id, + canonical + ); + } else +#endif { - next_id = id; - - raw_item = (void *) info->next(info->object_information, - canonical, - &next_id); - - if (raw_item) - { - info->canonical(canonical, raw_item); - _Thread_Enable_dispatch(); - } - } - return next_id; + next_id = id; + + raw_item = (void *) info->next( + info->object_information, + canonical, + &next_id + ); + + if (raw_item) { + info->canonical(canonical, raw_item); + _Thread_Enable_dispatch(); + } + } + return next_id; } -- cgit v1.2.3