Changeset 25408

Timestamp:

05/09/08 21:07:12 (1 week ago)

Author:

mmu_man

Message:

- dump termios struct for ttys
- implement VMIN & VTIME, at least it seems to work but it's 4am and it's overly weird, so please review.
See http://man.cx/termios and http://www.unixwiz.net/techtips/termios-vmin-vtime.html .

Files:

• haiku/trunk/src/add-ons/kernel/drivers/tty/tty.cpp (modified) (10 diffs)
• haiku/trunk/src/add-ons/kernel/drivers/tty/tty_private.h (modified) (1 diff)

haiku/trunk/src/add-ons/kernel/drivers/tty/tty.cpp

@@ -136 +136 @@
-                ~ReaderLocker();
-
-
+, size_t minBytes
-                status_t AcquireReader(bool dontBlock);
-
@@ -679 +679 @@
-
-status_t 
-
+, size_t minBytes
-{
-        if (fCookie->closed)
@@ -691 +691 @@
-        if (fRequestOwner.IsFirstInQueues()) {
-                fBytes = _CheckAvailableBytes();
-0
+minBytes
-                        return B_OK;
-        }
@@ -718 +718 @@
-ReaderLocker::AcquireReader(bool dontBlock)
-{
-
+, 0
-}
-
@@ -1501 +1501 @@
-        size_t length = *_length;
-        ssize_t bytesRead = 0;
+        bool canon = true;
-        bigtime_t timeout = dontBlock ? 0 : B_INFINITE_TIMEOUT;
-0LL
+timeout
-        size_t vmin = 0;
+        size_t minRead = 0;
-
-        TRACE(("tty_input_read(tty = %p, length = %lu, mode = %lu)\n", tty, length, mode));
@@ -1517 +1519 @@
-        ReaderLocker locker(cookie);
-
+        // handle raw mode
+        if ((!tty->is_master) && ((tty->settings->termios.c_lflag & ICANON) == 0)) {
+                canon = false;
+                vmin = tty->settings->termios.c_cc[VMIN];
+                // for now behaviour is undefined when nonblocking is enabled
+                //if (!dontBlock) // XXX does it take precedence or not ?
+                vtime = tty->settings->termios.c_cc[VTIME] * 100000LL;
+                TRACE(("tty_input_read: -icanon vmin %lu, vtime %Ldus\n", vmin, vtime));
+
+                // yes it's weird but termios is!
+                if (vmin && vtime == 0LL)
+                        vtime = B_INFINITE_TIMEOUT;
+                if (!vmin)
+                        timeout = vtime;
+                // timeout starts at 1st char when vmin > 0
+                // so we first wait for 1 char only
+                minRead = 0;
+        }
+
-        while (bytesRead == 0) {
-
+
+
+
+
+
+
-                if (status != B_OK) {
-                        *_length = 0;
@@ -1525 +1551 @@
-
-                size_t toRead = locker.AvailableBytes();
-
+
+
+
+
+
+
+
+
-                        continue;
-                if (toRead > length)
@@ -1531 +1564 @@
-
-                bool _hitEOF = false;
-
+
+
+
+
-
-                bytesRead = line_buffer_user_read(tty->input_buffer, (char *)buffer,
@@ -1924 +1960 @@
-        kprintf("  pgrp_id:      %ld\n", settings.pgrp_id);
-        kprintf("  session_id:   %ld\n", settings.session_id);
-
+
+
+
+
+
+
+
+
+
+
+
+
-        kprintf("  wsize:        %u x %u c, %u x %u pxl\n", 
-                settings.window_size.ws_row, settings.window_size.ws_col, 
@@ -1933 +1980 @@
-dump_tty_struct(struct tty& tty)
-{
+        kprintf("  tty @:        %p\n", &tty);
-        kprintf("  index:        %ld\n", tty.index);
-        kprintf("  is_master:    %s\n", tty.is_master ? "true" : "false");

haiku/trunk/src/add-ons/kernel/drivers/tty/tty_private.h

@@ -92 +92 @@
-                size_t BytesNeeded() const      { return fBytesNeeded; }
-
-=
+ = 
-
-                bool IsFirstInQueues();