Skip to content

Commit

Permalink
sched: Fold updating of the last_update_time_info into update_ts_time…
Browse files Browse the repository at this point in the history
…_stats()

This patch folds the updating of the last_update_time into the
update_ts_time_stats() function, and updates the callers.

This allows for further cleanups that are done in the next
patch.

Signed-off-by: Arjan van de Ven <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Reviewed-by: Rik van Riel <[email protected]>
Acked-by: Peter Zijlstra <[email protected]>
Cc: [email protected]
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
fenrus75 authored and Ingo Molnar committed May 9, 2010
1 parent 8c7b09f commit 8d63bf9
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions kernel/time/tick-sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ static void tick_nohz_update_jiffies(ktime_t now)
/*
* Updates the per cpu time idle statistics counters
*/
static void update_ts_time_stats(struct tick_sched *ts, ktime_t now)
static void
update_ts_time_stats(struct tick_sched *ts, ktime_t now, u64 *last_update_time)
{
ktime_t delta;

Expand All @@ -163,13 +164,19 @@ static void update_ts_time_stats(struct tick_sched *ts, ktime_t now)
ts->idle_sleeptime = ktime_add(ts->idle_sleeptime, delta);
ts->idle_entrytime = now;
}

if (ts->idle_active && last_update_time)
*last_update_time = ktime_to_us(ts->idle_lastupdate);
else
*last_update_time = ktime_to_us(now);

}

static void tick_nohz_stop_idle(int cpu, ktime_t now)
{
struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);

update_ts_time_stats(ts, now);
update_ts_time_stats(ts, now, NULL);
ts->idle_active = 0;

sched_clock_idle_wakeup_event(0);
Expand All @@ -181,7 +188,7 @@ static ktime_t tick_nohz_start_idle(struct tick_sched *ts)

now = ktime_get();

update_ts_time_stats(ts, now);
update_ts_time_stats(ts, now, NULL);

ts->idle_entrytime = now;
ts->idle_active = 1;
Expand All @@ -206,18 +213,11 @@ static ktime_t tick_nohz_start_idle(struct tick_sched *ts)
u64 get_cpu_idle_time_us(int cpu, u64 *last_update_time)
{
struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
ktime_t now;

if (!tick_nohz_enabled)
return -1;

now = ktime_get();
update_ts_time_stats(ts, now);

if (ts->idle_active)
*last_update_time = ktime_to_us(ts->idle_lastupdate);
else
*last_update_time = ktime_to_us(now);
update_ts_time_stats(ts, ktime_get(), last_update_time);

return ktime_to_us(ts->idle_sleeptime);
}
Expand Down

0 comments on commit 8d63bf9

Please sign in to comment.