add sched_class_proc_tick.(chyyuu#34)

LvJialer · Mar 11, 2018 · 6763945 · 6763945
1 parent 97b1ec4
commit 6763945
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/labcodes/lab6/kern/schedule/sched.c b/labcodes/lab6/kern/schedule/sched.c
@@ -30,7 +30,7 @@ sched_class_pick_next(void) {
     return sched_class->pick_next(rq);
 }
 
-static void
+void
 sched_class_proc_tick(struct proc_struct *proc) {
     if (proc != idleproc) {
         sched_class->proc_tick(rq, proc);

diff --git a/labcodes/lab6/kern/schedule/sched.h b/labcodes/lab6/kern/schedule/sched.h
@@ -47,6 +47,7 @@ struct run_queue {
 void sched_init(void);
 void wakeup_proc(struct proc_struct *proc);
 void schedule(void);
+void sched_class_proc_tick(struct proc_struct *proc);
 
 #endif /* !__KERN_SCHEDULE_SCHED_H__ */
 
diff --git a/labcodes_answer/lab6_result/kern/schedule/sched.c b/labcodes_answer/lab6_result/kern/schedule/sched.c
@@ -30,7 +30,7 @@ sched_class_pick_next(void) {
     return sched_class->pick_next(rq);
 }
 
-static void
+void
 sched_class_proc_tick(struct proc_struct *proc) {
     if (proc != idleproc) {
         sched_class->proc_tick(rq, proc);

diff --git a/labcodes_answer/lab6_result/kern/schedule/sched.h b/labcodes_answer/lab6_result/kern/schedule/sched.h
@@ -47,6 +47,7 @@ struct run_queue {
 void sched_init(void);
 void wakeup_proc(struct proc_struct *proc);
 void schedule(void);
+void sched_class_proc_tick(struct proc_struct *proc);
 
 #endif /* !__KERN_SCHEDULE_SCHED_H__ */
 
diff --git a/labcodes_answer/lab6_result/kern/trap/trap.c b/labcodes_answer/lab6_result/kern/trap/trap.c
@@ -233,7 +233,8 @@ trap_dispatch(struct trapframe *tf) {
          */
         ticks ++;
         assert(current != NULL);
-        break;
+        sched_class_proc_tick(current);
+		break;
     case IRQ_OFFSET + IRQ_COM1:
         c = cons_getc();
         cprintf("serial [%03d] %c\n", c, c);