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

2004-11-01 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* libmisc/monitor/mon-manager.c, libmisc/monitor/mon-object.c: Remove
	references to _Object_Is_local in single processor configurations.
This commit is contained in:
Joel Sherrill
2004-11-01 16:35:42 +00:00
parent d686006540
commit 6ca6ef40cf
3 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/libmisc/monitor/mon-manager.c
View File

@@ -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, &copy->name, sizeof(copy->name));
}
#if defined(RTEMS_MULTIPROCESSING)
done:
#endif
return object;
}

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

@@ -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;
next_id = id;
raw_item = (void *) info->next(info->object_information,
canonical,
&next_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;
if (raw_item) {
info->canonical(canonical, raw_item);
_Thread_Enable_dispatch();
}
}
return next_id;
}