\r
/* FreeRTOS includes. */\r
#include "FreeRTOS.h"\r
-#include "task.h"\r
\r
/* Utility functions to implement run time stats on Cortex-M CPUs. The collected\r
run time data can be viewed through the CLI interface. See the following URL for\r
more information on run time stats:\r
http://www.freertos.org/rtos-run-time-stats.html */\r
\r
-/* Used in the run time stats calculations. */\r
-static uint32_t ulClocksPer10thOfAMilliSecond = 0UL;\r
+/* Addresses of registers in the Cortex-M debug hardware. */\r
+#define rtsDWT_CYCCNT ( *( ( unsigned long * ) 0xE0001004 ) )\r
+#define rtsDWT_CONTROL ( *( ( unsigned long * ) 0xE0001000 ) )\r
+#define rtsSCB_DEMCR ( *( ( unsigned long * ) 0xE000EDFC ) )\r
+#define rtsTRCENA_BIT ( 0x01000000UL )\r
+#define rtsCOUNTER_ENABLE_BIT ( 0x01UL )\r
+\r
+/* Simple shift divide for scaling to avoid an overflow occurring too soon. The\r
+number of bits to shift depends on the clock speed. */\r
+#define runtimeSLOWER_CLOCK_SPEEDS ( 70000000UL )\r
+#define runtimeSHIFT_13 13\r
+#define runtimeOVERFLOW_BIT_13 ( 1UL << ( 32UL - runtimeSHIFT_13 ) )\r
+#define runtimeSHIFT_14 14\r
+#define runtimeOVERFLOW_BIT_14 ( 1UL << ( 32UL - runtimeSHIFT_14 ) )\r
\r
+/*-----------------------------------------------------------*/\r
\r
void vMainConfigureTimerForRunTimeStats( void )\r
{\r
- /* How many clocks are there per tenth of a millisecond? */\r
- ulClocksPer10thOfAMilliSecond = configCPU_CLOCK_HZ / 10000UL;\r
+ /* Enable TRCENA. */\r
+ rtsSCB_DEMCR = rtsSCB_DEMCR | rtsTRCENA_BIT;\r
+\r
+ /* Reset counter. */\r
+ rtsDWT_CYCCNT = 0;\r
+\r
+ /* Enable counter. */\r
+ rtsDWT_CONTROL = rtsDWT_CONTROL | rtsCOUNTER_ENABLE_BIT;\r
}\r
/*-----------------------------------------------------------*/\r
\r
uint32_t ulMainGetRunTimeCounterValue( void )\r
{\r
-uint32_t ulSysTickCounts, ulTickCount, ulReturn;\r
-const uint32_t ulSysTickReloadValue = ( configCPU_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;\r
-volatile uint32_t * const pulCurrentSysTickCount = ( ( volatile uint32_t *) 0xe000e018 );\r
-volatile uint32_t * const pulInterruptCTRLState = ( ( volatile uint32_t *) 0xe000ed04 );\r
-const uint32_t ulSysTickPendingBit = 0x04000000UL;\r
-\r
- /* NOTE: There are potentially race conditions here. However, it is used\r
- anyway to keep the examples simple, and to avoid reliance on a separate\r
- timer peripheral. */\r
-\r
-\r
- /* The SysTick is a down counter. How many clocks have passed since it was\r
- last reloaded? */\r
- ulSysTickCounts = ulSysTickReloadValue - *pulCurrentSysTickCount;\r
+static unsigned long ulLastCounterValue = 0UL, ulOverflows = 0;\r
+unsigned long ulValueNow;\r
\r
- /* How many times has it overflowed? */\r
- ulTickCount = xTaskGetTickCountFromISR();\r
+ ulValueNow = rtsDWT_CYCCNT;\r
\r
- /* Is there a SysTick interrupt pending? */\r
- if( ( *pulInterruptCTRLState & ulSysTickPendingBit ) != 0UL )\r
+ /* Has the value overflowed since it was last read. */\r
+ if( ulValueNow < ulLastCounterValue )\r
{\r
- /* There is a SysTick interrupt pending, so the SysTick has overflowed\r
- but the tick count not yet incremented. */\r
- ulTickCount++;\r
-\r
- /* Read the SysTick again, as the overflow might have occurred since\r
- it was read last. */\r
- ulSysTickCounts = ulSysTickReloadValue - *pulCurrentSysTickCount;\r
+ ulOverflows++;\r
}\r
+ ulLastCounterValue = ulValueNow;\r
\r
- /* Convert the tick count into tenths of a millisecond. THIS ASSUMES\r
- configTICK_RATE_HZ is 1000! */\r
- ulReturn = ( ulTickCount * 10UL ) ;\r
+ /* Cannot use configCPU_CLOCK_HZ directly as it may itself not be a constant\r
+ but instead map to a variable that holds the clock speed. */\r
\r
- /* Add on the number of tenths of a millisecond that have passed since the\r
- tick count last got updated. */\r
- ulReturn += ( ulSysTickCounts / ulClocksPer10thOfAMilliSecond );\r
+ /* There is no prescale on the counter, so simulate in software. */\r
+ if( configCPU_CLOCK_HZ < runtimeSLOWER_CLOCK_SPEEDS )\r
+ {\r
+ ulValueNow >>= runtimeSHIFT_13;\r
+ ulValueNow += ( runtimeOVERFLOW_BIT_13 * ulOverflows );\r
+ }\r
+ else\r
+ {\r
+ ulValueNow >>= runtimeSHIFT_14;\r
+ ulValueNow += ( runtimeOVERFLOW_BIT_14 * ulOverflows );\r
+ }\r
\r
- return ulReturn;\r
+ return ulValueNow;\r
}\r
/*-----------------------------------------------------------*/\r
\r
ulLastCounterValue = ulValueNow;\r
\r
/* There is no prescale on the counter, so simulate in software. */\r
- ulValueNow >>= runtimeCLOCK_SCALE_SHIFT + ( runtimeOVERFLOW_BIT * ulOverflows );\r
+ ulValueNow >>= runtimeCLOCK_SCALE_SHIFT;\r
+ ulValueNow += ( runtimeOVERFLOW_BIT * ulOverflows );\r
\r
return ulValueNow;\r
}\r
\r
/* FreeRTOS includes. */\r
#include "FreeRTOS.h"\r
-#include "task.h"\r
\r
/* Utility functions to implement run time stats on Cortex-M CPUs. The collected\r
run time data can be viewed through the CLI interface. See the following URL for\r
more information on run time stats:\r
http://www.freertos.org/rtos-run-time-stats.html */\r
\r
-/* Used in the run time stats calculations. */\r
-static uint32_t ulClocksPer10thOfAMilliSecond = 0UL;\r
+/* Addresses of registers in the Cortex-M debug hardware. */\r
+#define rtsDWT_CYCCNT ( *( ( unsigned long * ) 0xE0001004 ) )\r
+#define rtsDWT_CONTROL ( *( ( unsigned long * ) 0xE0001000 ) )\r
+#define rtsSCB_DEMCR ( *( ( unsigned long * ) 0xE000EDFC ) )\r
+#define rtsTRCENA_BIT ( 0x01000000UL )\r
+#define rtsCOUNTER_ENABLE_BIT ( 0x01UL )\r
+\r
+/* Simple shift divide for scaling to avoid an overflow occurring too soon. The\r
+number of bits to shift depends on the clock speed. */\r
+#define runtimeSLOWER_CLOCK_SPEEDS ( 70000000UL )\r
+#define runtimeSHIFT_13 13\r
+#define runtimeOVERFLOW_BIT_13 ( 1UL << ( 32UL - runtimeSHIFT_13 ) )\r
+#define runtimeSHIFT_14 14\r
+#define runtimeOVERFLOW_BIT_14 ( 1UL << ( 32UL - runtimeSHIFT_14 ) )\r
\r
+/*-----------------------------------------------------------*/\r
\r
void vConfigureTimerForRunTimeStats( void )\r
{\r
- /* How many clocks are there per tenth of a millisecond? */\r
- ulClocksPer10thOfAMilliSecond = configCPU_CLOCK_HZ / 10000UL;\r
+ /* Enable TRCENA. */\r
+ rtsSCB_DEMCR = rtsSCB_DEMCR | rtsTRCENA_BIT;\r
+\r
+ /* Reset counter. */\r
+ rtsDWT_CYCCNT = 0;\r
+\r
+ /* Enable counter. */\r
+ rtsDWT_CONTROL = rtsDWT_CONTROL | rtsCOUNTER_ENABLE_BIT;\r
}\r
/*-----------------------------------------------------------*/\r
\r
uint32_t ulGetRunTimeCounterValue( void )\r
{\r
-uint32_t ulSysTickCounts, ulTickCount, ulReturn;\r
-const uint32_t ulSysTickReloadValue = ( configCPU_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;\r
-volatile uint32_t * const pulCurrentSysTickCount = ( ( volatile uint32_t *) 0xe000e018 );\r
-volatile uint32_t * const pulInterruptCTRLState = ( ( volatile uint32_t *) 0xe000ed04 );\r
-const uint32_t ulSysTickPendingBit = 0x04000000UL;\r
-\r
- /* NOTE: There are potentially race conditions here. However, it is used\r
- anyway to keep the examples simple, and to avoid reliance on a separate\r
- timer peripheral. */\r
-\r
-\r
- /* The SysTick is a down counter. How many clocks have passed since it was\r
- last reloaded? */\r
- ulSysTickCounts = ulSysTickReloadValue - *pulCurrentSysTickCount;\r
+static unsigned long ulLastCounterValue = 0UL, ulOverflows = 0;\r
+unsigned long ulValueNow;\r
\r
- /* How many times has it overflowed? */\r
- ulTickCount = xTaskGetTickCountFromISR();\r
+ ulValueNow = rtsDWT_CYCCNT;\r
\r
- /* Is there a SysTick interrupt pending? */\r
- if( ( *pulInterruptCTRLState & ulSysTickPendingBit ) != 0UL )\r
+ /* Has the value overflowed since it was last read. */\r
+ if( ulValueNow < ulLastCounterValue )\r
{\r
- /* There is a SysTick interrupt pending, so the SysTick has overflowed\r
- but the tick count not yet incremented. */\r
- ulTickCount++;\r
-\r
- /* Read the SysTick again, as the overflow might have occurred since\r
- it was read last. */\r
- ulSysTickCounts = ulSysTickReloadValue - *pulCurrentSysTickCount;\r
+ ulOverflows++;\r
}\r
+ ulLastCounterValue = ulValueNow;\r
\r
- /* Convert the tick count into tenths of a millisecond. THIS ASSUMES\r
- configTICK_RATE_HZ is 1000! */\r
- ulReturn = ( ulTickCount * 10UL ) ;\r
+ /* Cannot use configCPU_CLOCK_HZ directly as it may itself not be a constant\r
+ but instead map to a variable that holds the clock speed. */\r
\r
- /* Add on the number of tenths of a millisecond that have passed since the\r
- tick count last got updated. */\r
- ulReturn += ( ulSysTickCounts / ulClocksPer10thOfAMilliSecond );\r
+ /* There is no prescale on the counter, so simulate in software. */\r
+ if( configCPU_CLOCK_HZ < runtimeSLOWER_CLOCK_SPEEDS )\r
+ {\r
+ ulValueNow >>= runtimeSHIFT_13;\r
+ ulValueNow += ( runtimeOVERFLOW_BIT_13 * ulOverflows );\r
+ }\r
+ else\r
+ {\r
+ ulValueNow >>= runtimeSHIFT_14;\r
+ ulValueNow += ( runtimeOVERFLOW_BIT_14 * ulOverflows );\r
+ }\r
\r
- return ulReturn;\r
+ return ulValueNow;\r
}\r
/*-----------------------------------------------------------*/\r
\r
ulTotalRunTime = portGET_RUN_TIME_COUNTER_VALUE();\r
#endif\r
\r
- /* Add the amount of time the task has been running to the accumulated\r
- time so far. The time the task started running was stored in\r
- ulTaskSwitchedInTime. Note that there is no overflow protection here\r
- so count values are only valid until the timer overflows. Generally\r
- this will be about 1 hour assuming a 1uS timer increment. */\r
- pxCurrentTCB->ulRunTimeCounter += ( ulTotalRunTime - ulTaskSwitchedInTime );\r
+ /* Add the amount of time the task has been running to the \r
+ accumulated time so far. The time the task started running was \r
+ stored in ulTaskSwitchedInTime. Note that there is no overflow \r
+ protection here so count values are only valid until the timer \r
+ overflows. The guard against negative values is to protect\r
+ against suspect run time stat counter implementations - which\r
+ are provided by the application, not the kernel. */\r
+ if( ulTotalRunTime > ulTaskSwitchedInTime )\r
+ {\r
+ pxCurrentTCB->ulRunTimeCounter += ( ulTotalRunTime - ulTaskSwitchedInTime );\r
+ }\r
ulTaskSwitchedInTime = ulTotalRunTime;\r
}\r
#endif /* configGENERATE_RUN_TIME_STATS */\r
projects / freertos / commitdiff