diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-07-23 19:51:08 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-07-23 19:51:08 +0000 |
commit | bd5762ddfc1b27f8a1671563503546bbfcfba3d2 (patch) | |
tree | edc3870fc1d5a92f41f7a5a7b889701a10853f95 /cpukit/libmisc/monitor/mon-prmisc.c | |
parent | 2008-07-23 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-bd5762ddfc1b27f8a1671563503546bbfcfba3d2.tar.bz2 |
2008-07-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/monitor/mon-extension.c, libmisc/monitor/mon-itask.c,
libmisc/monitor/mon-part.c, libmisc/monitor/mon-prmisc.c,
libmisc/monitor/mon-queue.c, libmisc/monitor/mon-region.c,
libmisc/monitor/mon-sema.c, libmisc/monitor/mon-task.c,
libmisc/monitor/monitor.h: Use rtems_object_get_name() instead of
internal routine. This makes it possible to also print string names
of POSIX objects. Adjust task report to realign since we can have
longer names.
Diffstat (limited to '')
-rw-r--r-- | cpukit/libmisc/monitor/mon-prmisc.c | 42 |
1 files changed, 8 insertions, 34 deletions
diff --git a/cpukit/libmisc/monitor/mon-prmisc.c b/cpukit/libmisc/monitor/mon-prmisc.c index 7907bd3be4..8deb62e775 100644 --- a/cpukit/libmisc/monitor/mon-prmisc.c +++ b/cpukit/libmisc/monitor/mon-prmisc.c @@ -43,15 +43,6 @@ rtems_monitor_pad( } int -rtems_monitor_dump_char(char ch) -{ - if (isprint(ch)) - return fprintf(stdout,"%c", ch); - else - return fprintf(stdout,"%02x", (unsigned char)ch); -} - -int rtems_monitor_dump_decimal(uint32_t num) { return fprintf(stdout,"%4" PRId32, num); @@ -98,25 +89,13 @@ rtems_monitor_dump_id(rtems_id id) } int -rtems_monitor_dump_name(rtems_name name) +rtems_monitor_dump_name(rtems_id id) { - uint32_t i; - int length = 0; - union { - uint32_t ui; - char c[4]; - } u; - - u.ui = (uint32_t ) name; - -#if (CPU_BIG_ENDIAN == TRUE) - for (i=0; i<sizeof(u.c); i++) - length += rtems_monitor_dump_char(u.c[i]); -#else - for (i=0; i<sizeof(u.c); i++) - length += rtems_monitor_dump_char(u.c[sizeof(u.c)-1-i]); -#endif - return length; + char name_buffer[18]; + + rtems_object_get_name( id, sizeof(name_buffer), name_buffer ); + + return fprintf( stdout, name_buffer ); } int @@ -250,15 +229,10 @@ rtems_assoc_t rtems_monitor_events_assoc[] = { int rtems_monitor_dump_events(rtems_event_set events) { - uint32_t length = 0; - if (events == EVENT_SETS_NONE_PENDING) /* value is 0 */ - length += fprintf(stdout,"NONE"); + return fprintf(stdout," NONE "); - length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_events_assoc, - ":", - events); - return length; + return fprintf(stdout,"%08" PRIx32, events); } int |