changeset 47:891a05313312

update
author mir3636
date Mon, 11 Feb 2019 15:23:36 +0900
parents 9243b1191c5c
children de8210a1f8e4
files paper/master_paper.pdf paper/src/console.c
diffstat 2 files changed, 2 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
Binary file paper/master_paper.pdf has changed
--- 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)