mirror of
https://github.com/GorgonMeducer/perf_counter.git
synced 2025-02-07 19:34:18 +08:00
reverse change
This commit is contained in:
parent
6232e88af4
commit
2d266becb3
@ -180,12 +180,7 @@ volatile static int32_t s_nSystemUS = 0;
|
|||||||
|
|
||||||
volatile static int64_t s_lSystemClockCounts = 0;
|
volatile static int64_t s_lSystemClockCounts = 0;
|
||||||
|
|
||||||
PERF_NOINIT
|
|
||||||
volatile static int64_t s_lNoInitTimestamp;
|
|
||||||
|
|
||||||
|
|
||||||
/*============================ PROTOTYPES ====================================*/
|
/*============================ PROTOTYPES ====================================*/
|
||||||
static int64_t get_no_init_timestamp(void);
|
|
||||||
|
|
||||||
/*============================ IMPLEMENTATION ================================*/
|
/*============================ IMPLEMENTATION ================================*/
|
||||||
/*============================ INCLUDES ======================================*/
|
/*============================ INCLUDES ======================================*/
|
||||||
@ -215,7 +210,6 @@ void user_code_insert_to_systick_handler(void)
|
|||||||
{
|
{
|
||||||
uint32_t wLoad = SysTick->LOAD + 1;
|
uint32_t wLoad = SysTick->LOAD + 1;
|
||||||
s_lSystemClockCounts += wLoad;
|
s_lSystemClockCounts += wLoad;
|
||||||
s_lNoInitTimestamp += wLoad;
|
|
||||||
|
|
||||||
// update system ms counter
|
// update system ms counter
|
||||||
do {
|
do {
|
||||||
@ -319,7 +313,7 @@ void before_cycle_counter_reconfiguration(void)
|
|||||||
|
|
||||||
}
|
}
|
||||||
s_lSystemClockCounts = get_system_ticks(); /* get the final cycle counter value */
|
s_lSystemClockCounts = get_system_ticks(); /* get the final cycle counter value */
|
||||||
s_lNoInitTimestamp = get_no_init_timestamp();
|
|
||||||
SysTick->LOAD = 0UL;
|
SysTick->LOAD = 0UL;
|
||||||
SysTick->VAL = 0UL; /* clear the Current Value Register */
|
SysTick->VAL = 0UL; /* clear the Current Value Register */
|
||||||
}
|
}
|
||||||
@ -396,17 +390,6 @@ int64_t get_system_ticks(void)
|
|||||||
return lTemp;
|
return lTemp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int64_t get_no_init_timestamp(void)
|
|
||||||
{
|
|
||||||
int64_t lTemp = 0;
|
|
||||||
|
|
||||||
__IRQ_SAFE {
|
|
||||||
lTemp = check_systick() + s_lNoInitTimestamp;
|
|
||||||
}
|
|
||||||
|
|
||||||
return lTemp;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! \note the prototype of this clock() is different from the one defined in
|
/*! \note the prototype of this clock() is different from the one defined in
|
||||||
*! time.h. As clock_t is usually defined as unsigned int, it is
|
*! time.h. As clock_t is usually defined as unsigned int, it is
|
||||||
*! not big enough in Cortex-M system to hold a time-stamp. clock()
|
*! not big enough in Cortex-M system to hold a time-stamp. clock()
|
||||||
@ -514,7 +497,6 @@ bool __perfc_is_time_out(int64_t lPeriod, int64_t *plTimestamp, bool bAutoReload
|
|||||||
uint32_t EventRecorderTimerSetup (void)
|
uint32_t EventRecorderTimerSetup (void)
|
||||||
{
|
{
|
||||||
/* doing nothing at all */
|
/* doing nothing at all */
|
||||||
s_lNoInitTimestamp = 0;
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -529,7 +511,7 @@ uint32_t EventRecorderTimerGetFreq (void)
|
|||||||
/// \return timer count (32-bit)
|
/// \return timer count (32-bit)
|
||||||
uint32_t EventRecorderTimerGetCount (void)
|
uint32_t EventRecorderTimerGetCount (void)
|
||||||
{
|
{
|
||||||
return get_no_init_timestamp();
|
return get_system_ticks();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user