sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPU load: Correct computation of the nominal period to use when the source is a oneshot timer.

Browse Source
This commit is contained in:
Gregory Nutt 2017-01-22 07:12:22 -06:00
parent 1e38884088
commit 686041f8e7
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sched/Kconfig
View File

@ -654,8 +654,8 @@ config CPULOAD_ONESHOT_ENTROPY
Where Where
CPULOAD_ONESHOT_NOMINAL is CONFIG_SCHED_CPULOAD_TICKSPERSEC in CPULOAD_ONESHOT_NOMINAL is the nominal sample internval implied
units of microseconds. by CONFIG_SCHED_CPULOAD_TICKSPERSEC in units of microseconds.
CPULOAD_ONESHOT_ENTROPY is (1 << CONFIG_CPULOAD_ONESHOT_ENTROPY), CPULOAD_ONESHOT_ENTROPY is (1 << CONFIG_CPULOAD_ONESHOT_ENTROPY),
and and
'error' is an error value that is retained from interval to 'error' is an error value that is retained from interval to

30
sched/sched/sched_cpuload_oneshot.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* sched/sched/sched_cpuload_oneshot.c * sched/sched/sched_cpuload_oneshot.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -56,25 +56,43 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/
#if !defined(CONFIG_SCHED_CPULOAD) || !defined(CONFIG_SCHED_CPULOAD_EXTCLK) #if !defined(CONFIG_SCHED_CPULOAD) || !defined(CONFIG_SCHED_CPULOAD_EXTCLK)
# error CONFIG_SCHED_CPULOAD and CONFIG_SCHED_CPULOAD_EXTCLK must be defined # error CONFIG_SCHED_CPULOAD and CONFIG_SCHED_CPULOAD_EXTCLK must be defined
#endif #endif
/* CONFIG_SCHED_CPULOAD_TICKSPERSEC is the frequency of the external clock
* source.
*/
#ifndef CONFIG_SCHED_CPULOAD_TICKSPERSEC #ifndef CONFIG_SCHED_CPULOAD_TICKSPERSEC
# error CONFIG_SCHED_CPULOAD_TICKSPERSEC not defined # error CONFIG_SCHED_CPULOAD_TICKSPERSEC not defined
#endif #endif
#define CPULOAD_ONESHOT_NOMINAL (CONFIG_SCHED_CPULOAD_TICKSPERSEC * 1000) /* CONFIG_CPULOAD_ONESHOT_ENTROPY determines that amount of random "jitter"
* that will be added to the nominal sample interval. Specified as a number
#if CPULOAD_ONESHOT_NOMINAL < 1 || CPULOAD_ONESHOT_NOMINAL > 0x7fffffff * bits.
# error CPULOAD_ONESHOT_NOMINAL is out of range */
#endif
#ifndef CONFIG_CPULOAD_ONESHOT_ENTROPY #ifndef CONFIG_CPULOAD_ONESHOT_ENTROPY
# warning CONFIG_CPULOAD_ONESHOT_ENTROPY not defined # warning CONFIG_CPULOAD_ONESHOT_ENTROPY not defined
# define CONFIG_CPULOAD_ONESHOT_ENTROPY 0 # define CONFIG_CPULOAD_ONESHOT_ENTROPY 0
#endif #endif
/* Calculate the nomimal sample interval in microseconds:
*
* nominal = (1,000,000 usec/sec) / Frequency cycles/sec) = Period usec/cycle
*/
#define CPULOAD_ONESHOT_NOMINAL (1000000 / CONFIG_SCHED_CPULOAD_TICKSPERSEC)
#if CPULOAD_ONESHOT_NOMINAL < 1 || CPULOAD_ONESHOT_NOMINAL > 0x7fffffff
# error CPULOAD_ONESHOT_NOMINAL is out of range
#endif
/* Convert the entropy from number of bits to a numeric value */
#define CPULOAD_ONESHOT_ENTROPY (1 << CONFIG_CPULOAD_ONESHOT_ENTROPY) #define CPULOAD_ONESHOT_ENTROPY (1 << CONFIG_CPULOAD_ONESHOT_ENTROPY)
#if CPULOAD_ONESHOT_NOMINAL < CPULOAD_ONESHOT_ENTROPY #if CPULOAD_ONESHOT_NOMINAL < CPULOAD_ONESHOT_ENTROPY