# HG changeset patch
# User mir3636
# Date 1549904498 -32400
# Node ID 4c6bb312f729be1e6e2d6f022acdd2d2569a49bb
# Parent  8be23dffcd3f03024a54bce1a8331cf82a76d143
add

diff -r 8be23dffcd3f -r 4c6bb312f729 paper/src/console.cbc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/paper/src/console.cbc	Tue Feb 12 02:01:38 2019 +0900
@@ -0,0 +1,79 @@
+__code cbc_consoleread2 ()
+{   
+    struct inode *ip = proc->cbc_arg.cbc_console_arg.ip;
+    __code(*next)(int ret) = proc->cbc_arg.cbc_console_arg.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_consoleread1();
+}
+
+__code cbc_consoleread1 ()
+{   
+    int cont = 1;
+    int n = proc->cbc_arg.cbc_console_arg.n;
+    int target = proc->cbc_arg.cbc_console_arg.target;
+    char* dst = proc->cbc_arg.cbc_console_arg.dst;
+    struct inode *ip = proc->cbc_arg.cbc_console_arg.ip;
+    __code(*next)(int ret) = proc->cbc_arg.cbc_console_arg.next;
+    
+    int c = input.buf[input.r++ % INPUT_BUF];
+    
+    if (c == C('D')) {  // EOF
+        if (n < target) {
+            // Save ^D for next time, to make sure
+            // caller gets a 0-byte result.
+            input.r--;
+        }
+        cont = 0;
+    }
+    
+    *dst++ = c;
+    --n;
+    
+    if (c == '\n') {
+        cont = 0;
+    }
+    
+    if (cont == 1) {
+        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;
+            goto cbc_sleep(&input.r, &input.lock, cbc_consoleread2);
+        }
+    }
+    
+    release(&input.lock);
+    ilock(ip);
+    
+    goto next(target - n);
+}
+
+__code cbc_consoleread (struct inode *ip, char *dst, int n, __code(*next)(int ret))
+{   
+    uint target;
+    
+    iunlock(ip);
+    
+    target = n;
+    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;
+        goto cbc_consoleread2();
+    }        
+    goto cbc_consoleread1();
+}
+
diff -r 8be23dffcd3f -r 4c6bb312f729 paper/src/consoleinit.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/paper/src/consoleinit.c	Tue Feb 12 02:01:38 2019 +0900
@@ -0,0 +1,13 @@
+void consoleinit (void)
+{
+    initlock(&cons.lock, "console");
+    initlock(&input.lock, "input");
+
+    devsw[CONSOLE].write = consolewrite;
+    devsw[CONSOLE].read = consoleread;
+    cbc_devsw[CONSOLE].write = cbc_consolewrite;
+    cbc_devsw[CONSOLE].read = cbc_consoleread;
+
+    cons.locking = 1;
+}
+