# HG changeset patch # User mir3636 # Date 1549866216 -32400 # Node ID 891a05313312a918622dfe19e8192be7eaf95712 # Parent 9243b1191c5c96f231df94c8b18e3ef5985f0f13 update diff -r 9243b1191c5c -r 891a05313312 paper/master_paper.pdf Binary file paper/master_paper.pdf has changed diff -r 9243b1191c5c -r 891a05313312 paper/src/console.c --- a/paper/src/console.c Mon Feb 11 15:19:22 2019 +0900 +++ b/paper/src/console.c Mon Feb 11 15:23:36 2019 +0900 @@ -67,22 +67,9 @@ acquire(&input.lock); if (n > 0) { - proc->cbc_arg.cbc_console_arg.n = n; - proc->cbc_arg.cbc_console_arg.target = target; - proc->cbc_arg.cbc_console_arg.dst = dst; - proc->cbc_arg.cbc_console_arg.ip = ip; - proc->cbc_arg.cbc_console_arg.next = next; - if (input.r == input.w) { - if (proc->killed) { - release(&input.lock); - ilock(ip); - goto next(-1); - } - - goto cbc_sleep(&input.r, &input.lock, cbc_consoleread2); - } + goto cbc_consoleread2(); + } goto cbc_consoleread1(); - } } int consoleread (struct inode *ip, char *dst, int n)