Changeset ca5fe67 in rtems

Timestamp:

08/02/02 00:43:44 (21 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

90f58823

Parents:

8378eae

Message:

2002-08-01 Joel Sherrill <joel@…>

• cpuuse/cpuuse.c (CPU_usage_Dump) : Corrected so it honors when an object name is raw versus being a string.

Files:

• c/src/libmisc/ChangeLog (modified) (1 diff)
• c/src/libmisc/cpuuse/cpuuse.c (modified) (3 diffs)
• cpukit/libmisc/ChangeLog (modified) (1 diff)
• cpukit/libmisc/cpuuse/cpuuse.c (modified) (3 diffs)

c/src/libmisc/ChangeLog

@@ +1 @@
+2002-08-01      Joel Sherrill <joel@OARcorp.com>
+
+        * cpuuse/cpuuse.c (CPU_usage_Dump) : Corrected so it honors when an
+        object name is raw versus being a string.
+
 2002-07-30      Joel Sherrill <joel@OARcorp.com>
 

c/src/libmisc/cpuuse/cpuuse.c

@@ -19 +19 @@
 #include <string.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include <rtems/cpuuse.h>
@@ -75 +76 @@
           continue;
 
-        u32_name = *(unsigned32 *)the_thread->Object.name;
+        if ( information->is_string )
+          u32_name = *(unsigned32 *)the_thread->Object.name;
+        else
+          u32_name = (unsigned32)the_thread->Object.name;
 
         name[ 0 ] = (u32_name >> 24) & 0xff;
@@ -82 +86 @@
         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] = '*';
 
 #if defined(unix) || ( CPU_HARDWARE_FP == TRUE )

cpukit/libmisc/ChangeLog

@@ +1 @@
+2002-08-01      Joel Sherrill <joel@OARcorp.com>
+
+        * cpuuse/cpuuse.c (CPU_usage_Dump) : Corrected so it honors when an
+        object name is raw versus being a string.
+
 2002-07-30      Joel Sherrill <joel@OARcorp.com>
 

cpukit/libmisc/cpuuse/cpuuse.c

@@ -19 +19 @@
 #include <string.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include <rtems/cpuuse.h>
@@ -75 +76 @@
           continue;
 
-        u32_name = *(unsigned32 *)the_thread->Object.name;
+        if ( information->is_string )
+          u32_name = *(unsigned32 *)the_thread->Object.name;
+        else
+          u32_name = (unsigned32)the_thread->Object.name;
 
         name[ 0 ] = (u32_name >> 24) & 0xff;
@@ -82 +86 @@
         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] = '*';
 
 #if defined(unix) || ( CPU_HARDWARE_FP == TRUE )