Changeset c0d814a in mainline for kernel/generic/src/printf/vprintf.c

Timestamp:

2025-04-10T20:02:30Z (4 days ago)

Author:

GitHub <noreply@…>

Children:

b8b031f

Parents:

a92290d (diff), 90dd8aee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Wayne Thornton <wmthornton-dev@…> (2025-04-10 20:02:30)

git-committer:

GitHub <noreply@…> (2025-04-10 20:02:30)

Message:

Merge pull request #6 from HelenOS/master

Merge pending changes from downstream helenos/master

File:

• kernel/generic/src/printf/vprintf.c (modified) (4 diffs)

kernel/generic/src/printf/vprintf.c

@@ -33 +33 @@
  */
 
+#include <arch/asm.h>
+#include <console/console.h>
 #include <print.h>
 #include <printf/printf_core.h>
 #include <putchar.h>
+#include <str.h>
 #include <synch/spinlock.h>
-#include <arch/asm.h>
 #include <typedefs.h>
-#include <str.h>
 
 static int vprintf_str_write(const char *str, size_t size, void *data)
@@ -74 +75 @@
         char32_t uc;
 
+        console_lock();
+
         while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) {
                 putuchar(uc);
@@ -80 +83 @@
 
         putuchar('\n');
+
+        console_unlock();
         return chars;
 }
@@ -91 +96 @@
         };
 
-        return printf_core(fmt, &ps, ap);
+        console_lock();
+        int ret = printf_core(fmt, &ps, ap);
+        console_unlock();
+        return ret;
 }