sched: Clean up the IRQ_TIME_ACCOUNTING code
Fix this warning:
lkml.org/lkml/2011/1/30/124
kernel/sched.c:3719: warning: 'irqtime_account_idle_ticks' defined but not used
kernel/sched.c:3720: warning: 'irqtime_account_process_tick' defined but not used
In a cleaner way than:
7e9498705e
: sched: Add #ifdef around irq time accounting functions
This patch will not have any functional impact.
Signed-off-by: Venkatesh Pallipadi <venki@google.com>
Cc: heiko.carstens@de.ibm.com
Cc: a.p.zijlstra@chello.nl
LKML-Reference: <1298675596-10992-1-git-send-email-venki@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
7e9498705e
commit
544b4a1f30
1 changed files with 31 additions and 33 deletions
|
@ -3687,7 +3687,36 @@ void account_system_time(struct task_struct *p, int hardirq_offset,
|
||||||
__account_system_time(p, cputime, cputime_scaled, target_cputime64);
|
__account_system_time(p, cputime, cputime_scaled, target_cputime64);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Account for involuntary wait time.
|
||||||
|
* @cputime: the cpu time spent in involuntary wait
|
||||||
|
*/
|
||||||
|
void account_steal_time(cputime_t cputime)
|
||||||
|
{
|
||||||
|
struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
|
||||||
|
cputime64_t cputime64 = cputime_to_cputime64(cputime);
|
||||||
|
|
||||||
|
cpustat->steal = cputime64_add(cpustat->steal, cputime64);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Account for idle time.
|
||||||
|
* @cputime: the cpu time spent in idle wait
|
||||||
|
*/
|
||||||
|
void account_idle_time(cputime_t cputime)
|
||||||
|
{
|
||||||
|
struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
|
||||||
|
cputime64_t cputime64 = cputime_to_cputime64(cputime);
|
||||||
|
struct rq *rq = this_rq();
|
||||||
|
|
||||||
|
if (atomic_read(&rq->nr_iowait) > 0)
|
||||||
|
cpustat->iowait = cputime64_add(cpustat->iowait, cputime64);
|
||||||
|
else
|
||||||
|
cpustat->idle = cputime64_add(cpustat->idle, cputime64);
|
||||||
|
}
|
||||||
|
|
||||||
#ifndef CONFIG_VIRT_CPU_ACCOUNTING
|
#ifndef CONFIG_VIRT_CPU_ACCOUNTING
|
||||||
|
|
||||||
#ifdef CONFIG_IRQ_TIME_ACCOUNTING
|
#ifdef CONFIG_IRQ_TIME_ACCOUNTING
|
||||||
/*
|
/*
|
||||||
* Account a tick to a process and cpustat
|
* Account a tick to a process and cpustat
|
||||||
|
@ -3749,42 +3778,11 @@ static void irqtime_account_idle_ticks(int ticks)
|
||||||
for (i = 0; i < ticks; i++)
|
for (i = 0; i < ticks; i++)
|
||||||
irqtime_account_process_tick(current, 0, rq);
|
irqtime_account_process_tick(current, 0, rq);
|
||||||
}
|
}
|
||||||
#else
|
#else /* CONFIG_IRQ_TIME_ACCOUNTING */
|
||||||
static void irqtime_account_idle_ticks(int ticks) {}
|
static void irqtime_account_idle_ticks(int ticks) {}
|
||||||
static void irqtime_account_process_tick(struct task_struct *p, int user_tick,
|
static void irqtime_account_process_tick(struct task_struct *p, int user_tick,
|
||||||
struct rq *rq) {}
|
struct rq *rq) {}
|
||||||
#endif
|
#endif /* CONFIG_IRQ_TIME_ACCOUNTING */
|
||||||
#endif /* !CONFIG_VIRT_CPU_ACCOUNTING */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Account for involuntary wait time.
|
|
||||||
* @steal: the cpu time spent in involuntary wait
|
|
||||||
*/
|
|
||||||
void account_steal_time(cputime_t cputime)
|
|
||||||
{
|
|
||||||
struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
|
|
||||||
cputime64_t cputime64 = cputime_to_cputime64(cputime);
|
|
||||||
|
|
||||||
cpustat->steal = cputime64_add(cpustat->steal, cputime64);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Account for idle time.
|
|
||||||
* @cputime: the cpu time spent in idle wait
|
|
||||||
*/
|
|
||||||
void account_idle_time(cputime_t cputime)
|
|
||||||
{
|
|
||||||
struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
|
|
||||||
cputime64_t cputime64 = cputime_to_cputime64(cputime);
|
|
||||||
struct rq *rq = this_rq();
|
|
||||||
|
|
||||||
if (atomic_read(&rq->nr_iowait) > 0)
|
|
||||||
cpustat->iowait = cputime64_add(cpustat->iowait, cputime64);
|
|
||||||
else
|
|
||||||
cpustat->idle = cputime64_add(cpustat->idle, cputime64);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef CONFIG_VIRT_CPU_ACCOUNTING
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Account a single tick of cpu time.
|
* Account a single tick of cpu time.
|
||||||
|
|
Reference in a new issue