summaryrefslogtreecommitdiff
path: root/kernel/src/libk
diff options
context:
space:
mode:
authorAleksa Vuckovic <aleksa@vuckovic.cc>2023-02-22 18:36:16 +0100
committerAleksa Vuckovic <aleksa@vuckovic.cc>2023-02-22 18:36:16 +0100
commit53069ae43ea997d51d2b985a26fffdb86a59b023 (patch)
tree173e9a3c452e2116db9a82f06de3761b97d6605b /kernel/src/libk
parent57e6722453c27d35a3b02309ce21263d225a23e3 (diff)
spinlocks in printf
Diffstat (limited to 'kernel/src/libk')
-rw-r--r--kernel/src/libk/serial_stdio.c4
-rw-r--r--kernel/src/libk/stdio.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/kernel/src/libk/serial_stdio.c b/kernel/src/libk/serial_stdio.c
index 951a170..8c0c527 100644
--- a/kernel/src/libk/serial_stdio.c
+++ b/kernel/src/libk/serial_stdio.c
@@ -5,6 +5,8 @@
#include <graphics.h>
#include <serial.h>
+mutex_t serial_stdio_lock;
+
void serial_print_char(char c)
{
write_serial(c);
@@ -43,6 +45,7 @@ void serial_printf(const char *s, ...)
void serial_vprintf(const char *s, va_list list)
{
+ lock(serial_stdio_lock);
size_t count = 0;
for(size_t i = 0; i < strlen(s); i++) if(s[i] == '%') count++;
@@ -63,4 +66,5 @@ void serial_vprintf(const char *s, va_list list)
}
else serial_print_char(s[i]);
}
+ unlock(serial_stdio_lock);
}
diff --git a/kernel/src/libk/stdio.c b/kernel/src/libk/stdio.c
index 8ecd97c..18f3d3f 100644
--- a/kernel/src/libk/stdio.c
+++ b/kernel/src/libk/stdio.c
@@ -3,6 +3,8 @@
#include <graphics.h>
#include <serial.h>
+mutex_t stdio_lock;
+
void print_char(char c)
{
if (main_fb.x * 8 >= main_fb.width) {
@@ -64,6 +66,7 @@ void printf(const char *s, ...)
void vprintf(const char *s, va_list list)
{
+ lock(stdio_lock);
size_t count = 0;
for(size_t i = 0; i < strlen(s); i++) if(s[i] == '%') count++;
@@ -84,4 +87,5 @@ void vprintf(const char *s, va_list list)
}
else print_char(s[i]);
}
+ unlock(stdio_lock);
}