Changeset 39e1b9a in mainline for kernel/generic/src/console/console.c

Timestamp:

2025-04-17T15:37:05Z (5 days ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

250a435

Parents:

690ad20

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-14 16:54:54)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-17 15:37:05)

Message:

Convert console output devices to batch printing

File:

• kernel/generic/src/console/console.c (modified) (5 diffs)

kernel/generic/src/console/console.c

@@ -80 +80 @@
 IRQ_SPINLOCK_INITIALIZE(kio_lock);
 
+static IRQ_SPINLOCK_INITIALIZE(flush_lock);
+
 static IRQ_SPINLOCK_INITIALIZE(early_mbstate_lock);
 static mbstate_t early_mbstate;
@@ -93 +95 @@
 };
 
-static void stdout_write(outdev_t *, char32_t);
+static void stdout_write(outdev_t *, const char *, size_t);
 static void stdout_redraw(outdev_t *);
 static void stdout_scroll_up(outdev_t *);
@@ -146 +148 @@
 }
 
-static void stdout_write(outdev_t *dev, char32_t ch)
+static void stdout_write(outdev_t *dev, const char *s, size_t n)
 {
         list_foreach(dev->list, link, outdev_t, sink) {
                 if ((sink) && (sink->op->write))
-                        sink->op->write(sink, ch);
+                        sink->op->write(sink, s, n);
         }
 }
@@ -249 +251 @@
         irq_spinlock_lock(&kio_lock, true);
 
-        static mbstate_t mbstate;
+        if (!irq_spinlock_trylock(&flush_lock)) {
+                /* Someone is currently flushing. */
+                irq_spinlock_unlock(&kio_lock, true);
+                return;
+        }
+
+        /* A small-ish local buffer so that we can write to output in chunks. */
+        char buffer[256];
 
         /* Print characters that weren't printed earlier */
@@ -255 +264 @@
                 size_t offset = kio_processed % KIO_LENGTH;
                 size_t len = min(kio_written - kio_processed, KIO_LENGTH - offset);
-                size_t bytes = 0;
-
-                char32_t ch = str_decode_r(&kio[offset], &bytes, len, U'�', &mbstate);
-                assert(bytes <= 4);
-                kio_processed += bytes;
+                len = min(len, sizeof(buffer));
+
+                /* Take out a chunk of the big buffer. */
+                memcpy(buffer, &kio[offset], len);
+                kio_processed += len;
 
                 /*
-                 * We need to give up the spinlock for
-                 * the physical operation of writing out
-                 * the character.
+                 * We need to give up the spinlock for the physical operation of writing
+                 * out the buffer.
                  */
                 irq_spinlock_unlock(&kio_lock, true);
-                stdout->op->write(stdout, ch);
+                stdout->op->write(stdout, buffer, len);
                 irq_spinlock_lock(&kio_lock, true);
         }
 
+        irq_spinlock_unlock(&flush_lock, false);
         irq_spinlock_unlock(&kio_lock, true);
 }