diff --git a/labcodes/lab4/kern/process/proc.c b/labcodes/lab4/kern/process/proc.c index 9c0b0e3..7d57c65 100644 --- a/labcodes/lab4/kern/process/proc.c +++ b/labcodes/lab4/kern/process/proc.c @@ -283,7 +283,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -294,7 +294,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid fork_out: return ret; diff --git a/labcodes/lab5/kern/process/proc.c b/labcodes/lab5/kern/process/proc.c index 2cacac3..e6ff1f3 100644 --- a/labcodes/lab5/kern/process/proc.c +++ b/labcodes/lab5/kern/process/proc.c @@ -382,7 +382,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -393,7 +393,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) @@ -615,7 +615,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes/lab6/kern/process/proc.c b/labcodes/lab6/kern/process/proc.c index 5f5e1bc..54aea05 100644 --- a/labcodes/lab6/kern/process/proc.c +++ b/labcodes/lab6/kern/process/proc.c @@ -392,7 +392,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -403,7 +403,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) @@ -625,7 +625,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes/lab7/kern/process/proc.c b/labcodes/lab7/kern/process/proc.c index 323a81b..33821f7 100644 --- a/labcodes/lab7/kern/process/proc.c +++ b/labcodes/lab7/kern/process/proc.c @@ -392,7 +392,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -403,7 +403,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) @@ -625,7 +625,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes/lab8/kern/process/proc.c b/labcodes/lab8/kern/process/proc.c index b6cccf8..fc239eb 100644 --- a/labcodes/lab8/kern/process/proc.c +++ b/labcodes/lab8/kern/process/proc.c @@ -440,7 +440,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -451,7 +451,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) @@ -609,7 +609,7 @@ failed_cleanup: return ret; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, int argc, const char **argv) { diff --git a/labcodes_answer/lab4_result/kern/process/proc.c b/labcodes_answer/lab4_result/kern/process/proc.c index 36e1348..f0a9e36 100644 --- a/labcodes_answer/lab4_result/kern/process/proc.c +++ b/labcodes_answer/lab4_result/kern/process/proc.c @@ -295,7 +295,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -306,7 +306,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid if ((proc = alloc_proc()) == NULL) { goto fork_out; diff --git a/labcodes_answer/lab5_result/kern/process/proc.c b/labcodes_answer/lab5_result/kern/process/proc.c index 686708a..31e42ad 100644 --- a/labcodes_answer/lab5_result/kern/process/proc.c +++ b/labcodes_answer/lab5_result/kern/process/proc.c @@ -390,7 +390,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -401,7 +401,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid if ((proc = alloc_proc()) == NULL) { goto fork_out; @@ -647,7 +647,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes_answer/lab6_result/kern/process/proc.c b/labcodes_answer/lab6_result/kern/process/proc.c index 8c61e68..993869c 100644 --- a/labcodes_answer/lab6_result/kern/process/proc.c +++ b/labcodes_answer/lab6_result/kern/process/proc.c @@ -396,7 +396,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -407,7 +407,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid if ((proc = alloc_proc()) == NULL) { goto fork_out; @@ -653,7 +653,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes_answer/lab7_result/kern/process/proc.c b/labcodes_answer/lab7_result/kern/process/proc.c index eb538b8..9431cf6 100644 --- a/labcodes_answer/lab7_result/kern/process/proc.c +++ b/labcodes_answer/lab7_result/kern/process/proc.c @@ -402,7 +402,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -413,7 +413,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) @@ -667,7 +667,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes_answer/lab8_result/kern/process/proc.c b/labcodes_answer/lab8_result/kern/process/proc.c index efd2bd9..6182379 100644 --- a/labcodes_answer/lab8_result/kern/process/proc.c +++ b/labcodes_answer/lab8_result/kern/process/proc.c @@ -449,7 +449,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -460,7 +460,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) @@ -801,7 +801,7 @@ failed_cleanup: return ret; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, int argc, const char **argv) { diff --git a/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c b/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c index 9eaed2f..b54ee2a 100644 --- a/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c +++ b/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c @@ -266,7 +266,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -281,7 +281,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { copy_thread(proc, stack, tf); // 4. insert proc_struct into proc_list list_add_before(&proc_list, &proc->list_link); - // 5. call wakup_proc to make the new child process RUNNABLE + // 5. call wakeup_proc to make the new child process RUNNABLE wakeup_proc(proc); // 7. set ret vaule using child proc's pid nr_process++; diff --git a/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c b/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c index 686708a..31e42ad 100644 --- a/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c +++ b/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c @@ -390,7 +390,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -401,7 +401,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid if ((proc = alloc_proc()) == NULL) { goto fork_out; @@ -647,7 +647,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) {