From 1a561f81306a3a0de1dcf22309627cc8eef28dc4 Mon Sep 17 00:00:00 2001 From: Eric Norum Date: Thu, 29 Sep 2005 14:20:21 +0000 Subject: Remove floating point calculations and the C preprocessor conditions which enabled them. --- cpukit/ChangeLog | 5 +++++ cpukit/libmisc/cpuuse/cpuuse.c | 25 ++++++++----------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 0666186d38..80df76caab 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2005-09-29 Eric Norum + + * libmisc/cpuuse/cpuuse.c: Remove floating point calculations and the + C preprocessor conditions which enabled them. + 2005-09-25 Joel Sherrill * sapi/include/rtems/init.h, sapi/src/exinit.c: Remove unused and diff --git a/cpukit/libmisc/cpuuse/cpuuse.c b/cpukit/libmisc/cpuuse/cpuuse.c index 189b542644..2906f622df 100644 --- a/cpukit/libmisc/cpuuse/cpuuse.c +++ b/cpukit/libmisc/cpuuse/cpuuse.c @@ -8,7 +8,7 @@ * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. * - * $Id$ + * cpuuse.c,v 1.20 2004/04/17 08:12:01 ralf Exp * */ @@ -42,6 +42,7 @@ void CPU_usage_Dump( void ) uint32_t u32_name; char *cname; char name[5]; + uint32_t ival, fval; uint32_t total_units = 0; for ( api_index = 1 ; @@ -61,11 +62,7 @@ void CPU_usage_Dump( void ) } fprintf(stdout,"CPU Usage by thread\n"); -#if defined(unix) || ( CPU_HARDWARE_FP == TRUE ) fprintf(stdout, " ID NAME TICKS PERCENT\n" ); -#else - fprintf(stdout, " ID NAME TICKS\n" ); -#endif for ( api_index = 1 ; api_index <= OBJECTS_APIS_LAST ; @@ -101,22 +98,16 @@ void CPU_usage_Dump( void ) if ( !isprint(name[2]) ) name[2] = '*'; if ( !isprint(name[3]) ) name[3] = '*'; -#if defined(unix) || ( CPU_HARDWARE_FP == TRUE ) - fprintf(stdout, "0x%08x %4s %8d %5.3f\n", + ival = total_units ? the_thread->ticks_executed * 10000 / total_units : 0; + fval = ival % 100; + ival /= 100; + fprintf(stdout, "0x%08x %4s %8d %3d.%2.2d\n", the_thread->Object.id, name, the_thread->ticks_executed, - (total_units) ? - (double)the_thread->ticks_executed / (double)total_units : - (double)total_units + ival, + fval ); -#else - fprintf(stdout, "0x%08x %4s %8d\n", - the_thread->Object.id, - name, - the_thread->ticks_executed - ); -#endif } } } -- cgit v1.2.3