diff options
author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2015-05-27 10:13:58 -0500 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2015-06-15 13:20:17 -0500 |
commit | e6b31b27fbe3cd76534db2d4fc4ef5dcdf0d33b4 (patch) | |
tree | e833cd29335dedfba764815c61a92c0a4cab1347 /cpukit/score | |
parent | score: Add _Watchdog_Preinitialize() (diff) | |
download | rtems-e6b31b27fbe3cd76534db2d4fc4ef5dcdf0d33b4.tar.bz2 |
Remove use ticks for statistics configure option.
This was obsolete and broken based upon recent time keeping changes.
Thie build option was previously enabled by adding
USE_TICKS_FOR_STATISTICS=1 to the configure command line.
This propagated into the code as preprocessor conditionals
using the __RTEMS_USE_TICKS_FOR_STATISTICS__ conditional.
Diffstat (limited to 'cpukit/score')
-rw-r--r-- | cpukit/score/include/rtems/score/thread.h | 8 | ||||
-rw-r--r-- | cpukit/score/src/schedulerdefaulttick.c | 7 | ||||
-rw-r--r-- | cpukit/score/src/threaddispatch.c | 15 | ||||
-rw-r--r-- | cpukit/score/src/threadinitialize.c | 6 |
4 files changed, 7 insertions, 29 deletions
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h index c69646b26b..05c1ff79b9 100644 --- a/cpukit/score/include/rtems/score/thread.h +++ b/cpukit/score/include/rtems/score/thread.h @@ -83,13 +83,9 @@ extern "C" { * The user can define this at configure time and go back to ticks * resolution. */ -#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ - #include <rtems/score/timestamp.h> +#include <rtems/score/timestamp.h> - typedef Timestamp_Control Thread_CPU_usage_t; -#else - typedef uint32_t Thread_CPU_usage_t; -#endif +typedef Timestamp_Control Thread_CPU_usage_t; /** * The following defines the "return type" of a thread. diff --git a/cpukit/score/src/schedulerdefaulttick.c b/cpukit/score/src/schedulerdefaulttick.c index db67ca1508..19acd3b2b8 100644 --- a/cpukit/score/src/schedulerdefaulttick.c +++ b/cpukit/score/src/schedulerdefaulttick.c @@ -31,13 +31,6 @@ void _Scheduler_default_Tick( { (void) scheduler; - #ifdef __RTEMS_USE_TICKS_FOR_STATISTICS__ - /* - * Increment the number of ticks this thread has been executing - */ - executing->cpu_time_used++; - #endif - /* * If the thread is not preemptible or is not ready, then * just return. diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c index f20f427bd6..cce3affda4 100644 --- a/cpukit/score/src/threaddispatch.c +++ b/cpukit/score/src/threaddispatch.c @@ -99,17 +99,10 @@ void _Thread_Do_dispatch( Per_CPU_Control *cpu_self, ISR_Level level ) _ISR_Enable( level ); #endif - #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ - _Thread_Update_cpu_time_used( - executing, - &cpu_self->time_of_last_context_switch - ); - #else - { - _TOD_Get_uptime( &cpu_self->time_of_last_context_switch ); - heir->cpu_time_used++; - } - #endif + _Thread_Update_cpu_time_used( + executing, + &cpu_self->time_of_last_context_switch + ); #if !defined(__DYNAMIC_REENT__) /* diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c index 3c0a412aee..c6985f013b 100644 --- a/cpukit/score/src/threadinitialize.c +++ b/cpukit/score/src/threadinitialize.c @@ -217,11 +217,7 @@ bool _Thread_Initialize( /* * Initialize the CPU usage statistics */ - #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ - _Timestamp_Set_to_zero( &the_thread->cpu_time_used ); - #else - the_thread->cpu_time_used = 0; - #endif + _Timestamp_Set_to_zero( &the_thread->cpu_time_used ); /* * initialize thread's key vaule node chain |