fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / kernel / vserver / sched_proc.h

diff --git a/kernel/vserver/sched_proc.h b/kernel/vserver/sched_proc.h
index e65a3df..ae2c515 100644 (file)
--- a/kernel/vserver/sched_proc.h
+++ b/kernel/vserver/sched_proc.h
@@ -2,38 +2,60 @@
 #define _VX_SCHED_PROC_H
 
 
-static inline int vx_info_proc_sched(struct _vx_sched *sched, char *buffer)
+static inline
+int vx_info_proc_sched(struct _vx_sched *sched, char *buffer)
 {
        int length = 0;
-       int i;
 
        length += sprintf(buffer,
-               "Token:\t\t%8d\n"
-               "FillRate:\t%8d\n"
-               "Interval:\t%8d\n"
+               "FillRate:\t%8d,%d\n"
+               "Interval:\t%8d,%d\n"
                "TokensMin:\t%8d\n"
                "TokensMax:\t%8d\n"
                "PrioBias:\t%8d\n"
-               "VaVaVoom:\t%8d\n"
-               ,atomic_read(&sched->tokens)
-               ,sched->fill_rate
-               ,sched->interval
+               ,sched->fill_rate[0]
+               ,sched->fill_rate[1]
+               ,sched->interval[0]
+               ,sched->interval[1]
                ,sched->tokens_min
                ,sched->tokens_max
-               ,sched->priority_bias
-               ,sched->vavavoom
+               ,sched->prio_bias
                );
+       return length;
+}
 
-       for_each_online_cpu(i) {
-               length += sprintf(buffer + length,
-                       "cpu %d: %lld %lld %lld\n"
-                       ,i
-                       ,(long long)sched->cpu[i].user_ticks
-                       ,(long long)sched->cpu[i].sys_ticks
-                       ,(long long)sched->cpu[i].hold_ticks
-                       );
-       }
+static inline
+int vx_info_proc_sched_pc(struct _vx_sched_pc *sched_pc,
+       char *buffer, int cpu)
+{
+       int length = 0;
 
+       length += sprintf(buffer + length,
+               "cpu %d: %lld %lld %lld %ld %ld"
+               ,cpu
+               ,(unsigned long long)sched_pc->user_ticks
+               ,(unsigned long long)sched_pc->sys_ticks
+               ,(unsigned long long)sched_pc->hold_ticks
+               ,sched_pc->token_time
+               ,sched_pc->idle_time
+               );
+       length += sprintf(buffer + length,
+               " %c%c %d %d %d %d/%d %d/%d"
+               ,(sched_pc->flags & VXSF_ONHOLD) ? 'H' : 'R'
+               ,(sched_pc->flags & VXSF_IDLE_TIME) ? 'I' : '-'
+               ,sched_pc->tokens
+               ,sched_pc->tokens_min
+               ,sched_pc->tokens_max
+               ,sched_pc->fill_rate[0]
+               ,sched_pc->interval[0]
+               ,sched_pc->fill_rate[1]
+               ,sched_pc->interval[1]
+               );
+       length += sprintf(buffer + length,
+               " %d %d\n"
+               ,sched_pc->prio_bias
+               ,sched_pc->vavavoom
+               );
        return length;
 }