From 77bca1aeb7d72936742740951c7f0f1f8d8760e2 Mon Sep 17 00:00:00 2001 From: Stefan Moll <stefan@stefaus.de> Date: Tue, 27 Sep 2022 15:45:55 +0200 Subject: [PATCH] cleanup proc fs output method --- kernel/sched/pb.c | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/kernel/sched/pb.c b/kernel/sched/pb.c index 3fae16b3ec4f..01c30585430b 100644 --- a/kernel/sched/pb.c +++ b/kernel/sched/pb.c @@ -144,7 +144,7 @@ void init_pb_rq(struct pb_rq *pb_rq) pb_rq->n_admin_cycles = 20; pb_rq->count_admin_cycles = 0; pb_rq->mode = PB_DISABLED_MODE; - pb_rq->c_entry = -1; + pb_rq->c_entry = 0; pb_rq->size = 0; pb_rq->pevent = NULL; pb_rq->is_initialized = 0; @@ -375,12 +375,10 @@ const struct sched_class pb_sched_class = { EXPORT_SYMBOL(pb_sched_class); -///////////////////// ProcFS Ausgabe /////////////////////////////////// -static struct plan_entry dummy_plan = { - .n_instr = 20000, - .task_id = 0xCAFE, - .task_struct = NULL, -}; +/*********************************************************************** + * /proc filesystem entry + * use 'cat /proc/pbsched' to read + **********************************************************************/ static int show_pbsched(struct seq_file *seq, void *v) { @@ -393,12 +391,6 @@ static int show_pbsched(struct seq_file *seq, void *v) struct rq *rq; struct pb_rq *pb; - // perf event stuff here is for testing and will be deleted in the future - struct perf_event *event; - int perf_init_res; - u64 perf_counter; - u64 read_error; - int i; struct plan_entry *plan; @@ -406,8 +398,6 @@ static int show_pbsched(struct seq_file *seq, void *v) rq = cpu_rq(cpu); pb = &(rq->pb); - perf_init_res = init_perf_event(&dummy_plan, &event); - switch(pb->mode) { case PB_DISABLED_MODE: mode='D'; break; case PB_EXEC_MODE: mode='E'; break; @@ -415,16 +405,6 @@ static int show_pbsched(struct seq_file *seq, void *v) default: mode='U'; break; } - read_error = get_perf_counter(event, &perf_counter); - - printk(KERN_WARNING "get_perf_counter: %llu\n", perf_counter); - - terminate_perf_event(event); - - if (read_error) { - printk(KERN_WARNING "Hi! FETCHING PERFORMANCE COUNTER IN PB SCHEDULER FAILED WITH %llu\n", read_error); - } - /* runqueue-specific stats */ seq_printf(seq, "cpu%d %c %u %llu %llu\n", -- GitLab