enable kexec

[linux-2.6.git] / kernel / ckrm / ckrm_cpu_class.c

diff --git a/kernel/ckrm/ckrm_cpu_class.c b/kernel/ckrm/ckrm_cpu_class.c
index a066e73..917875b 100644 (file)
--- a/kernel/ckrm/ckrm_cpu_class.c
+++ b/kernel/ckrm/ckrm_cpu_class.c
@@ -47,6 +47,7 @@ void init_cpu_class(struct ckrm_cpu_class *cls,ckrm_shares_t* shares)
        cls->shares = *shares;
        cls->cnt_lock = SPIN_LOCK_UNLOCKED;
        ckrm_cpu_stat_init(&cls->stat);
+       ckrm_usage_init(&cls->usage);
        cls->magic = CKRM_CPU_CLASS_MAGIC;
 
        for (i = 0 ; i < NR_CPUS ; i++) {
@@ -71,10 +72,11 @@ void init_cpu_class(struct ckrm_cpu_class *cls,ckrm_shares_t* shares)
                queue->classqueue = get_cpu_classqueue(i);
                queue->top_priority = MAX_PRIO;
                cq_node_init(&queue->classqueue_linkobj);
-               queue->local_cvt = CVT_INTERACTIVE_BONUS;
+               queue->local_cvt = 0;
                queue->lrq_load = 0;
                queue->local_weight = cpu_class_weight(cls);
                queue->uncounted_ns = 0;
+               queue->savings = 0;
                queue->magic = 0x43FF43D7;
        }
 
@@ -178,6 +180,9 @@ static void ckrm_free_cpu_class(void *my_res)
        write_unlock(&class_list_lock);
 
        kfree(cls);
+
+       //call ckrm_cpu_monitor after class removed
+       ckrm_cpu_monitor(0);
 }                              
 
 /*
@@ -218,6 +223,10 @@ int ckrm_cpu_set_share(void *my_res, struct ckrm_shares *new_share)
        if (cls->parent) {
                spin_unlock(&parres->cnt_lock);
        }
+
+       //call ckrm_cpu_monitor after changes are changed
+       ckrm_cpu_monitor(0);
+
        return rc;
 }                                                      
                        
@@ -258,11 +267,16 @@ int ckrm_cpu_get_stats(void *my_res, struct seq_file * sfile)
        seq_printf(sfile, "\tmehl= %d\n",stat->mehl);
        seq_printf(sfile, "\teshare= %d\n",stat->eshare);
        seq_printf(sfile, "\tmeshare= %d\n",cpu_class_weight(cls));
-       seq_printf(sfile, "\ttotal_ns= %llu\n",stat->total_ns);
        seq_printf(sfile, "\tmax_demand= %lu\n",stat->max_demand);
+       seq_printf(sfile, "\ttotal_ns= %llu\n",stat->total_ns);
+       seq_printf(sfile, "\tusage(2,10,60)= %d %d %d\n",
+                  get_ckrm_usage(cls,2*HZ),
+                  get_ckrm_usage(cls,10*HZ),
+                  get_ckrm_usage(cls,60*HZ)
+                  );
        for_each_online_cpu(i) {
                lrq = get_ckrm_lrq(cls,i);              
-               seq_printf(sfile, "\tlrq %d demand= %lu weight= %d lrq_load= %lu cvt= %llu\n",i,stat->local_stats[i].cpu_demand,local_class_weight(lrq),lrq->lrq_load,lrq->local_cvt);
+               seq_printf(sfile, "\tlrq %d demand= %lu weight= %d lrq_load= %lu cvt= %llu sav= %llu\n",i,stat->local_stats[i].cpu_demand,local_class_weight(lrq),lrq->lrq_load,lrq->local_cvt,lrq->savings);
        }
 
        seq_printf(sfile, "-------- CPU Class Status END ---------\n");
@@ -304,7 +318,7 @@ static int ckrm_cpu_set_config(void *my_res, const char *cfgstr)
 
        if (!cls) 
                return -EINVAL;
-       printk("ckrm_cpu config='%s'\n",cfgstr);
+       printk(KERN_DEBUG "ckrm_cpu config='%s'\n",cfgstr);
        return 0;
 }
        
@@ -335,7 +349,7 @@ int __init init_ckrm_sched_res(void)
 
        if (resid == -1) { /*not registered */
                resid = ckrm_register_res_ctlr(clstype,&cpu_rcbs);
-               printk("........init_ckrm_sched_res , resid= %d\n",resid);
+               printk(KERN_DEBUG "........init_ckrm_sched_res , resid= %d\n",resid);
        }
        return 0;
 }