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

sched: rename nxsched_cpu_process_cpuload

Browse Source 
put nxsched_process_cpuload_ticks partial implementation into nxsched_task_process_cpuload

Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
This commit is contained in:
yinshengkai 2023-04-26 21:43:22 +08:00 committed by Xiang Xiao
parent 08c4ac133b
commit e8bf910c3d
2 changed files with 37 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sched/sched/sched.h
View File

@ -398,6 +398,7 @@ int nxsched_pause_cpu(FAR struct tcb_s *tcb);
/* CPU load measurement support */ /* CPU load measurement support */
#ifdef CONFIG_SCHED_CPULOAD_SYSCLK #ifdef CONFIG_SCHED_CPULOAD_SYSCLK
void nxsched_process_taskload_ticks(FAR struct tcb_s *tcb, uint32_t ticks);
void nxsched_process_cpuload_ticks(uint32_t ticks); void nxsched_process_cpuload_ticks(uint32_t ticks);
#define nxsched_process_cpuload() nxsched_process_cpuload_ticks(1) #define nxsched_process_cpuload() nxsched_process_cpuload_ticks(1)
#endif #endif

90
sched/sched/sched_cpuload.c
View File

@ -62,7 +62,7 @@
CPULOAD_TICKSPERSEC) CPULOAD_TICKSPERSEC)
/**************************************************************************** /****************************************************************************
* Private Data * Public Data
****************************************************************************/ ****************************************************************************/
/* This is the total number of clock tick counts. Essentially the /* This is the total number of clock tick counts. Essentially the
@ -81,46 +81,58 @@
volatile uint32_t g_cpuload_total; volatile uint32_t g_cpuload_total;
/**************************************************************************** /****************************************************************************
* Private Functions * Public Functions
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nxsched_cpu_process_cpuload * Name: nxsched_process_taskload_ticks
* *
* Description: * Description:
* Collect data that can be used for CPU load measurements. * Collect data that can be used for task load measurements.
* *
* Input Parameters: * Input Parameters:
* cpu - The CPU that we are performing the load operations on. * tcb - The task that we are performing the load operations on.
* ticks - The ticks that we process in this cpuload. * ticks - The ticks that we process in this cpuload.
* *
* Returned Value: * Returned Value:
* None * None
* *
* Assumptions/Limitations:
* This function is called from a timer interrupt handler with all
* interrupts disabled.
*
****************************************************************************/ ****************************************************************************/
static inline void nxsched_cpu_process_cpuload(int cpu, uint32_t ticks) void nxsched_process_taskload_ticks(FAR struct tcb_s *tcb, uint32_t ticks)
{ {
FAR struct tcb_s *rtcb = current_task(cpu); irqstate_t flags;
/* Increment the count on the currently executing thread */ flags = enter_critical_section();
rtcb->ticks += ticks;
/* Increment tick count. NOTE that the count is increment once for each
* CPU on each sample interval.
*/
tcb->ticks += ticks;
g_cpuload_total += ticks; g_cpuload_total += ticks;
}
/**************************************************************************** if (g_cpuload_total > CPULOAD_TIMECONSTANT)
* Public Functions {
****************************************************************************/ uint32_t total = 0;
int i;
/* Divide the tick count for every task by two and recalculate the
* total.
*/
for (i = 0; i < g_npidhash; i++)
{
if (g_pidhash[i])
{
g_pidhash[i]->ticks >>= 1;
total += g_pidhash[i]->ticks;
}
}
/* Save the new total. */
g_cpuload_total = total;
}
leave_critical_section(flags);
}
/**************************************************************************** /****************************************************************************
* Name: nxsched_process_cpuload_ticks * Name: nxsched_process_cpuload_ticks
@ -146,44 +158,14 @@ static inline void nxsched_cpu_process_cpuload(int cpu, uint32_t ticks)
void nxsched_process_cpuload_ticks(uint32_t ticks) void nxsched_process_cpuload_ticks(uint32_t ticks)
{ {
int i; int i;
irqstate_t flags;
/* Perform scheduler operations on all CPUs. */ /* Perform scheduler operations on all CPUs. */
flags = enter_critical_section();
for (i = 0; i < CONFIG_SMP_NCPUS; i++) for (i = 0; i < CONFIG_SMP_NCPUS; i++)
{ {
nxsched_cpu_process_cpuload(i, ticks); FAR struct tcb_s *rtcb = current_task(i);
nxsched_process_taskload_ticks(rtcb, ticks);
} }
/* If the accumulated tick value exceed a time constant, then shift the
* accumulators and recalculate the total.
*/
if (g_cpuload_total > CPULOAD_TIMECONSTANT)
{
uint32_t total = 0;
/* Divide the tick count for every task by two and recalculate the
* total.
*/
for (i = 0; i < g_npidhash; i++)
{
if (g_pidhash[i])
{
g_pidhash[i]->ticks >>= 1;
total += g_pidhash[i]->ticks;
}
}
/* Save the new total. */
g_cpuload_total = total;
}
leave_critical_section(flags);
} }
/**************************************************************************** /****************************************************************************