sched: task_listをtask_instance_tableへ改名

task_listはstruct taskのリスト構造の汎用的な名前として使用するため

Author: Yuma Arakawa

kernel/include/sched.h

@@ -24,7 +24,7 @@ struct task {
 	unsigned char wakeup_after_event;
 };
 
-extern struct task task_list[TASK_NUM];
+extern struct task task_instance_table[TASK_NUM];
 extern unsigned char context_switch_template[CONTEXT_SWITCH_FN_SIZE];
 
 unsigned short sched_get_current(void);

kernel/kern_task_init.c

@@ -25,5 +25,5 @@ void kern_task_init(void)
 	__asm__("ltr %0"::"r"(segment_selector));
 
 	/* Setup context switch function */
-	task_list[KERN_TASK_ID].context_switch = kern_task_context_switch;
+	task_instance_table[KERN_TASK_ID].context_switch = kern_task_context_switch;
 }

kernel/main.c

@@ -137,32 +137,32 @@ static void task_init(unsigned short task_id,
 	}
 
 	/* Setup task_id */
-	task_list[task_id].task_id = task_id;
+	task_instance_table[task_id].task_id = task_id;
 
 	/* Setup context switch function */
-	copy_mem(context_switch_template, task_list[task_id].context_switch_func, CONTEXT_SWITCH_FN_SIZE);
-	task_list[task_id].context_switch_func[CONTEXT_SWITCH_FN_TSKNO_FIELD] = 8 * (task_id - 1) + 0x20;
-	task_list[task_id].context_switch = (void (*)(void))task_list[task_id].context_switch_func;
+	copy_mem(context_switch_template, task_instance_table[task_id].context_switch_func, CONTEXT_SWITCH_FN_SIZE);
+	task_instance_table[task_id].context_switch_func[CONTEXT_SWITCH_FN_TSKNO_FIELD] = 8 * (task_id - 1) + 0x20;
+	task_instance_table[task_id].context_switch = (void (*)(void))task_instance_table[task_id].context_switch_func;
 
 	/* Setup GDT for task_tss */
-	init_gdt(task_id + GDT_IDX_OFS, (unsigned int)&task_list[task_id].tss, sizeof(struct tss), 3);
+	init_gdt(task_id + GDT_IDX_OFS, (unsigned int)&task_instance_table[task_id].tss, sizeof(struct tss), 3);
 
 	/* Setup task_tss */
-	task_list[task_id].tss.eip = APP_ENTRY_POINT;
-	task_list[task_id].tss.esp = 0x20001800;
-	task_list[task_id].tss.eflags = 0x00000200;
-	task_list[task_id].tss.esp0 = APP_STACK_BASE;
-	task_list[task_id].tss.ss0 = 0x0010;
-	task_list[task_id].tss.es = 0x0038 | 0x0003;
-	task_list[task_id].tss.cs = 0x0030 | 0x0003;
-	task_list[task_id].tss.ss = 0x0038 | 0x0003;
-	task_list[task_id].tss.ds = 0x0038 | 0x0003;
-	task_list[task_id].tss.fs = 0x0038 | 0x0003;
-	task_list[task_id].tss.gs = 0x0038 | 0x0003;
-	task_list[task_id].tss.__cr3 = (unsigned int)pd_base_addr | 0x18;
+	task_instance_table[task_id].tss.eip = APP_ENTRY_POINT;
+	task_instance_table[task_id].tss.esp = 0x20001800;
+	task_instance_table[task_id].tss.eflags = 0x00000200;
+	task_instance_table[task_id].tss.esp0 = APP_STACK_BASE;
+	task_instance_table[task_id].tss.ss0 = 0x0010;
+	task_instance_table[task_id].tss.es = 0x0038 | 0x0003;
+	task_instance_table[task_id].tss.cs = 0x0030 | 0x0003;
+	task_instance_table[task_id].tss.ss = 0x0038 | 0x0003;
+	task_instance_table[task_id].tss.ds = 0x0038 | 0x0003;
+	task_instance_table[task_id].tss.fs = 0x0038 | 0x0003;
+	task_instance_table[task_id].tss.gs = 0x0038 | 0x0003;
+	task_instance_table[task_id].tss.__cr3 = (unsigned int)pd_base_addr | 0x18;
 
 	/* Add task to run_queue */
-	sched_runq_enq(&task_list[task_id]);
+	sched_runq_enq(&task_instance_table[task_id]);
 }
 
 int main(void)

kernel/sched.c

@@ -7,7 +7,7 @@
 #include <kernel.h>
 #include <kern_task.h>
 
-struct task task_list[TASK_NUM];
+struct task task_instance_table[TASK_NUM];
 
 static struct task *current_task = NULL;
 static struct {
@@ -112,7 +112,7 @@ void schedule(unsigned char cause_id)
 			current_task = NULL;
 			outb_p(IOADR_MPIC_OCW2_BIT_MANUAL_EOI | INTR_IR_TIMER,
 			       IOADR_MPIC_OCW2);
-			task_list[KERN_TASK_ID].context_switch();
+			task_instance_table[KERN_TASK_ID].context_switch();
 		}
 	} else if (current_task) {
 		if (current_task != current_task->next) {