Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 71318
b: refs/heads/master
c: 480b943
h: refs/heads/master
v: v3
  • Loading branch information
Ken Chen authored and Ingo Molnar committed Oct 18, 2007
1 parent 2dec1cc commit f870634
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 38 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cc4ea79588e688ea9b1161650979a194dd709169
refs/heads/master: 480b9434c542ddf2833aaed3dabba71bc0b787b5
42 changes: 21 additions & 21 deletions trunk/include/linux/sched.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ struct sched_info {
last_queued; /* when we were last queued to run */
#ifdef CONFIG_SCHEDSTATS
/* BKL stats */
unsigned long bkl_count;
unsigned int bkl_count;
#endif
};
#endif /* defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) */
Expand Down Expand Up @@ -705,34 +705,34 @@ struct sched_domain {

#ifdef CONFIG_SCHEDSTATS
/* load_balance() stats */
unsigned long lb_count[CPU_MAX_IDLE_TYPES];
unsigned long lb_failed[CPU_MAX_IDLE_TYPES];
unsigned long lb_balanced[CPU_MAX_IDLE_TYPES];
unsigned long lb_imbalance[CPU_MAX_IDLE_TYPES];
unsigned long lb_gained[CPU_MAX_IDLE_TYPES];
unsigned long lb_hot_gained[CPU_MAX_IDLE_TYPES];
unsigned long lb_nobusyg[CPU_MAX_IDLE_TYPES];
unsigned long lb_nobusyq[CPU_MAX_IDLE_TYPES];
unsigned int lb_count[CPU_MAX_IDLE_TYPES];
unsigned int lb_failed[CPU_MAX_IDLE_TYPES];
unsigned int lb_balanced[CPU_MAX_IDLE_TYPES];
unsigned int lb_imbalance[CPU_MAX_IDLE_TYPES];
unsigned int lb_gained[CPU_MAX_IDLE_TYPES];
unsigned int lb_hot_gained[CPU_MAX_IDLE_TYPES];
unsigned int lb_nobusyg[CPU_MAX_IDLE_TYPES];
unsigned int lb_nobusyq[CPU_MAX_IDLE_TYPES];

/* Active load balancing */
unsigned long alb_count;
unsigned long alb_failed;
unsigned long alb_pushed;
unsigned int alb_count;
unsigned int alb_failed;
unsigned int alb_pushed;

/* SD_BALANCE_EXEC stats */
unsigned long sbe_count;
unsigned long sbe_balanced;
unsigned long sbe_pushed;
unsigned int sbe_count;
unsigned int sbe_balanced;
unsigned int sbe_pushed;

/* SD_BALANCE_FORK stats */
unsigned long sbf_count;
unsigned long sbf_balanced;
unsigned long sbf_pushed;
unsigned int sbf_count;
unsigned int sbf_balanced;
unsigned int sbf_pushed;

/* try_to_wake_up() stats */
unsigned long ttwu_wake_remote;
unsigned long ttwu_move_affine;
unsigned long ttwu_move_balance;
unsigned int ttwu_wake_remote;
unsigned int ttwu_move_affine;
unsigned int ttwu_move_balance;
#endif
};

Expand Down
20 changes: 10 additions & 10 deletions trunk/kernel/sched.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,22 +332,22 @@ struct rq {
struct sched_info rq_sched_info;

/* sys_sched_yield() stats */
unsigned long yld_exp_empty;
unsigned long yld_act_empty;
unsigned long yld_both_empty;
unsigned long yld_count;
unsigned int yld_exp_empty;
unsigned int yld_act_empty;
unsigned int yld_both_empty;
unsigned int yld_count;

/* schedule() stats */
unsigned long sched_switch;
unsigned long sched_count;
unsigned long sched_goidle;
unsigned int sched_switch;
unsigned int sched_count;
unsigned int sched_goidle;

/* try_to_wake_up() stats */
unsigned long ttwu_count;
unsigned long ttwu_local;
unsigned int ttwu_count;
unsigned int ttwu_local;

/* BKL stats */
unsigned long bkl_count;
unsigned int bkl_count;
#endif
struct lock_class_key rq_lock_key;
};
Expand Down
2 changes: 1 addition & 1 deletion trunk/kernel/sched_debug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
SEQ_printf(m, " .%-30s: %ld\n", "nr_running", cfs_rq->nr_running);
SEQ_printf(m, " .%-30s: %ld\n", "load", cfs_rq->load.weight);
#ifdef CONFIG_SCHEDSTATS
SEQ_printf(m, " .%-30s: %ld\n", "bkl_count",
SEQ_printf(m, " .%-30s: %d\n", "bkl_count",
rq->bkl_count);
#endif
SEQ_printf(m, " .%-30s: %ld\n", "nr_spread_over",
Expand Down
8 changes: 3 additions & 5 deletions trunk/kernel/sched_stats.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ static int show_schedstat(struct seq_file *seq, void *v)

/* runqueue-specific stats */
seq_printf(seq,
"cpu%d %lu %lu %lu %lu %lu %lu %lu %lu %lu %llu %llu %lu",
"cpu%d %u %u %u %u %u %u %u %u %u %llu %llu %lu",
cpu, rq->yld_both_empty,
rq->yld_act_empty, rq->yld_exp_empty, rq->yld_count,
rq->sched_switch, rq->sched_count, rq->sched_goidle,
Expand All @@ -42,8 +42,7 @@ static int show_schedstat(struct seq_file *seq, void *v)
seq_printf(seq, "domain%d %s", dcount++, mask_str);
for (itype = CPU_IDLE; itype < CPU_MAX_IDLE_TYPES;
itype++) {
seq_printf(seq, " %lu %lu %lu %lu %lu %lu %lu "
"%lu",
seq_printf(seq, " %u %u %u %u %u %u %u %u",
sd->lb_count[itype],
sd->lb_balanced[itype],
sd->lb_failed[itype],
Expand All @@ -53,8 +52,7 @@ static int show_schedstat(struct seq_file *seq, void *v)
sd->lb_nobusyq[itype],
sd->lb_nobusyg[itype]);
}
seq_printf(seq, " %lu %lu %lu %lu %lu %lu %lu %lu %lu"
" %lu %lu %lu\n",
seq_printf(seq, " %u %u %u %u %u %u %u %u %u %u %u %u\n",
sd->alb_count, sd->alb_failed, sd->alb_pushed,
sd->sbe_count, sd->sbe_balanced, sd->sbe_pushed,
sd->sbf_count, sd->sbf_balanced, sd->sbf_pushed,
Expand Down

0 comments on commit f870634

Please sign in to comment.