Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-17 04:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

2003-12-11 Joel Sherrill <joel@OARcorp.com>

Browse Source 
PR 540/rtems_misc
	* cpuuse/cpuuse.c, rtmonuse/rtmonuse.c: Correct object name printing.
This commit is contained in:
Joel Sherrill
2003-12-11 14:21:00 +00:00
parent 028e84cf16
commit e482c59285
3 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/libmisc/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-12-11 Joel Sherrill <joel@OARcorp.com>
PR 540/rtems_misc
* cpuuse/cpuuse.c, rtmonuse/rtmonuse.c: Correct object name printing.
2003-12-11 Joel Sherrill <joel@OARcorp.com> 2003-12-11 Joel Sherrill <joel@OARcorp.com>
PR 531/rtems_misc PR 531/rtems_misc

24
cpukit/libmisc/cpuuse/cpuuse.c
View File

@@ -40,6 +40,7 @@ void CPU_usage_Dump( void )
Thread_Control *the_thread; Thread_Control *the_thread;
Objects_Information *information; Objects_Information *information;
unsigned32 u32_name; unsigned32 u32_name;
char *cname;
char name[5]; char name[5];
unsigned32 total_units = 0; unsigned32 total_units = 0;
@@ -79,16 +80,21 @@ void CPU_usage_Dump( void )
if ( !the_thread ) if ( !the_thread )
continue; continue;
if ( information->is_string ) if ( information->is_string ) {
u32_name = *(unsigned32 *)the_thread->Object.name; cname = the_thread->Object.name;
else name[ 0 ] = cname[0];
name[ 1 ] = cname[1];
name[ 2 ] = cname[2];
name[ 3 ] = cname[3];
name[ 4 ] = '\0';
} else {
u32_name = (unsigned32)the_thread->Object.name; u32_name = (unsigned32)the_thread->Object.name;
name[ 0 ] = (u32_name >> 24) & 0xff;
name[ 0 ] = (u32_name >> 24) & 0xff; name[ 1 ] = (u32_name >> 16) & 0xff;
name[ 1 ] = (u32_name >> 16) & 0xff; name[ 2 ] = (u32_name >> 8) & 0xff;
name[ 2 ] = (u32_name >> 8) & 0xff; name[ 3 ] = (u32_name >> 0) & 0xff;
name[ 3 ] = (u32_name >> 0) & 0xff; name[ 4 ] = '\0';
name[ 4 ] = '\0'; }
if ( !isprint(name[0]) ) name[0] = '*'; if ( !isprint(name[0]) ) name[0] = '*';
if ( !isprint(name[1]) ) name[1] = '*'; if ( !isprint(name[1]) ) name[1] = '*';

44
cpukit/libmisc/rtmonuse/rtmonuse.c
View File

@@ -10,6 +10,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include <ctype.h>
#include <rtems/rtmonuse.h> #include <rtems/rtmonuse.h>
@@ -130,7 +131,10 @@ void Period_usage_Dump( void )
Period_usage_t *the_usage; Period_usage_t *the_usage;
Rate_monotonic_Control *the_period; Rate_monotonic_Control *the_period;
unsigned32 u32_name; unsigned32 u32_name;
char *cname;
char name[5]; char name[5];
unsigned32 api_index;
Objects_Information *information;
if ( !Period_usage_Information ) { if ( !Period_usage_Information ) {
printf( "Period statistics library is not initialized\n" ); printf( "Period statistics library is not initialized\n" );
@@ -154,17 +158,39 @@ void Period_usage_Dump( void )
the_period = the_period =
(Rate_monotonic_Control *)_Rate_monotonic_Information.local_table[ i ]; (Rate_monotonic_Control *)_Rate_monotonic_Information.local_table[ i ];
if ( the_period->owner ) name[ 0 ] = ' ';
u32_name = *(unsigned32 *)the_period->owner->Object.name; name[ 1 ] = ' ';
else name[ 2 ] = ' ';
u32_name = rtems_build_name(' ', ' ', ' ', ' '); name[ 3 ] = ' ';
name[ 0 ] = (u32_name >> 24) & 0xff;
name[ 1 ] = (u32_name >> 16) & 0xff;
name[ 2 ] = (u32_name >> 8) & 0xff;
name[ 3 ] = (u32_name >> 0) & 0xff;
name[ 4 ] = '\0'; name[ 4 ] = '\0';
if ( the_period->owner ) {
api_index = _Objects_Get_API(the_period->owner->Object.id);
information = _Objects_Information_table[ api_index ][ 1 ];
if ( information->is_string ) {
cname = the_period->owner->Object.name;
name[ 0 ] = cname[0];
name[ 1 ] = cname[1];
name[ 2 ] = cname[2];
name[ 3 ] = cname[3];
name[ 4 ] = '\0';
} else {
u32_name = (unsigned32)the_period->owner->Object.name;
name[ 0 ] = (u32_name >> 24) & 0xff;
name[ 1 ] = (u32_name >> 16) & 0xff;
name[ 2 ] = (u32_name >> 8) & 0xff;
name[ 3 ] = (u32_name >> 0) & 0xff;
name[ 4 ] = '\0';
}
}
if ( !isprint(name[0]) ) name[0] = '*';
if ( !isprint(name[1]) ) name[1] = '*';
if ( !isprint(name[2]) ) name[2] = '*';
if ( !isprint(name[3]) ) name[3] = '*';
printf( printf(
"0x%08x %4s %6d %3d %d/%d/%5.2f %d/%d/%3.2f\n", "0x%08x %4s %6d %3d %d/%d/%5.2f %d/%d/%3.2f\n",
the_usage->id, the_usage->id,