printf: Update to add removed spinlocks

vlang · Dec 19, 2023 · f0de8f6 · f0de8f6
1 parent c144d1c
commit f0de8f6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/kernel/GNUmakefile b/kernel/GNUmakefile
@@ -54,8 +54,6 @@ override INTERNALCFLAGS :=        \
 	-Wno-unused-function          \
 	-Wno-unused-variable          \
 	-Wno-unused-parameter         \
-	-DPRINTF_ALIAS_STANDARD_FUNCTION_NAMES=1 \
-	-DPRINTF_ALIAS_STANDARD_FUNCTION_NAMES_HARD=1 \
 	-DPRINTF_SUPPORT_DECIMAL_SPECIFIERS=0 \
 	-DPRINTF_SUPPORT_EXPONENTIAL_SPECIFIERS=0 \
 	-Ifreestanding_headers        \

diff --git a/kernel/c/printf.c b/kernel/c/printf.c
@@ -26,12 +26,26 @@ void putchar_(char c) {
   putchar_func(c);
 }
 
-int printf_panic(char *fmt, ...) {
+void klock__Lock_acquire(void *);
+void klock__Lock_release(void *);
+extern char printf_lock;
+
+int printf(const char *fmt, ...) {
+  va_list l;
+  va_start(l, fmt);
+  klock__Lock_acquire(&printf_lock);
+  int ret = vprintf_(fmt, l);
+  klock__Lock_release(&printf_lock);
+  va_end(l);
+  return ret;
+}
+
+int printf_panic(const char *fmt, ...) {
   va_list l;
   va_start(l, fmt);
   void (*old_func)(char) = putchar_func;
   putchar_func = _putchar_panic;
-  int ret = vprintf(fmt, l);
+  int ret = vprintf_(fmt, l);
   va_end(l);
   putchar_func = old_func;
   return ret;