Changeset bfd247f in mainline

Timestamp:

2009-06-29T09:20:10Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7fcb74c

Parents:

415c7e0d

Message:

set buffering according to what file descriptor we are opening
(this still does not cover the full complexity of stdio buffering)

File:

• uspace/lib/libc/generic/io/io.c (modified) (15 diffs)

uspace/lib/libc/generic/io/io.c

@@ -181 +181 @@
 }
 
+static void _setvbuf(FILE *stream)
+{
+        /* FIXME: Use more complex rules for setting buffering options. */
+        
+        switch (stream->fd) {
+        case 1:
+                setvbuf(stream, NULL, _IOLBF, BUFSIZ);
+                break;
+        case 0:
+        case 2:
+                setvbuf(stream, NULL, _IONBF, 0);
+                break;
+        default:
+                setvbuf(stream, NULL, _IOFBF, BUFSIZ);
+        }
+}
+
 /** Allocate stream buffer. */
 static int _fallocbuf(FILE *stream)
 {
         assert(stream->buf == NULL);
-
+        
         stream->buf = malloc(stream->buf_size);
         if (stream->buf == NULL) {
@@ -191 +208 @@
                 return -1;
         }
-
+        
         stream->buf_head = stream->buf;
         return 0;
@@ -226 +243 @@
         stream->klog = false;
         stream->phone = -1;
-
-        /* FIXME: Should select buffering type based on what was opened. */
-        setvbuf(stream, NULL, _IOFBF, BUFSIZ);
+        _setvbuf(stream);
         
         list_append(&stream->link, &files);
@@ -249 +264 @@
         stream->klog = false;
         stream->phone = -1;
-
-        /* FIXME: Should select buffering type based on what was opened. */
-        setvbuf(stream, NULL, _IOLBF, BUFSIZ);
+        _setvbuf(stream);
         
         list_append(&stream->link, &files);
@@ -282 +295 @@
         stream->klog = false;
         stream->phone = -1;
-
-        /* FIXME: Should select buffering type based on what was opened. */
-        setvbuf(stream, NULL, _IOLBF, BUFSIZ);
+        _setvbuf(stream);
         
         list_append(&stream->link, &files);
@@ -332 +343 @@
         size_t left = size * nmemb;
         size_t done = 0;
-
+        
         /* Make sure no data is pending write. */
         _fflushbuf(stream);
-
+        
         while ((left > 0) && (!stream->error) && (!stream->eof)) {
                 ssize_t rd = read(stream->fd, buf + done, left);
@@ -380 +391 @@
 {
         size_t bytes_used;
-
-        if (!stream->buf || stream->btype == _IONBF || stream->error)
+        
+        if ((!stream->buf) || (stream->btype == _IONBF) || (stream->error))
                 return;
-
+        
         bytes_used = stream->buf_head - stream->buf;
         if (bytes_used == 0)
                 return;
-
+        
         (void) _fwrite(stream->buf, 1, bytes_used, stream);
         stream->buf_head = stream->buf;
@@ -410 +421 @@
         uint8_t b;
         bool need_flush;
-
+        
         /* If not buffered stream, write out directly. */
-        if (stream->btype == _IONBF)
-                return _fwrite(buf, size, nmemb, stream);
-
+        if (stream->btype == _IONBF) {
+                now = _fwrite(buf, size, nmemb, stream);
+                fflush(stream);
+                return now;
+        }
+        
         /* Perform lazy allocation of stream buffer. */
         if (stream->buf == NULL) {
@@ -420 +434 @@
                         return 0; /* Errno set by _fallocbuf(). */
         }
-
+        
         data = (uint8_t *) buf;
         bytes_left = size * nmemb;
         total_written = 0;
         need_flush = false;
-
-        while (!stream->error && bytes_left > 0) {
-
+        
+        while ((!stream->error) && (bytes_left > 0)) {
                 buf_free = stream->buf_size - (stream->buf_head - stream->buf);
                 if (bytes_left > buf_free)
@@ -433 +446 @@
                 else
                         now = bytes_left;
-
+                
                 for (i = 0; i < now; i++) {
                         b = data[i];
                         stream->buf_head[i] = b;
-
-                        if (b == '\n' && stream->btype == _IOLBF)
+                        
+                        if ((b == '\n') && (stream->btype == _IOLBF))
                                 need_flush = true;
                 }
-
+                
                 buf += now;
                 stream->buf_head += now;
@@ -447 +460 @@
                 bytes_left -= now;
                 total_written += now;
-
+                
                 if (buf_free == 0) {
                         /* Only need to drain buffer. */
@@ -454 +467 @@
                 }
         }
-
+        
         if (need_flush)
                 fflush(stream);
-
+        
         return (total_written / size);
 }
@@ -496 +509 @@
 {
         char c;
-
+        
         /* This could be made faster by only flushing when needed. */
         if (stdout)
@@ -502 +515 @@
         if (stderr)
                 fflush(stderr);
-
+        
         if (fread(&c, sizeof(char), 1, stream) < sizeof(char))
                 return EOF;
@@ -535 +548 @@
 {
         _fflushbuf(stream);
-
+        
         if (stream->klog) {
                 klog_update();