refactor: full rewrite of signal feature

[lunaix-os.git] / lunaix-os / kernel / kprintf.c

diff --git a/lunaix-os/kernel/kprintf.c b/lunaix-os/kernel/kprintf.c
index d18691ac2fd1fa6d9ccd3389dcb7058c5710408d..91646e9e51d281b4c50551180abce74de2dedaff 100644 (file)
--- a/lunaix-os/kernel/kprintf.c
+++ b/lunaix-os/kernel/kprintf.c
@@ -1,5 +1,7 @@
 #include <klibc/stdio.h>
 #include <lunaix/lxconsole.h>
 #include <klibc/stdio.h>
 #include <lunaix/lxconsole.h>

+#include <lunaix/spike.h>
+#include <lunaix/syscall.h>

 #include <lunaix/syslog.h>
 #include <lunaix/tty/tty.h>
 
 #include <lunaix/syslog.h>
 #include <lunaix/tty/tty.h>
 


@@ -7,69 +9,63 @@
 #define MAX_XFMT_SIZE 512
 
 void
 #define MAX_XFMT_SIZE 512
 
 void

-__kprintf(const char* component, const char* fmt, va_list args)
+__kprintf_internal(const char* component,
+                   int log_level,
+                   const char* fmt,
+                   va_list args)

 {
     char buf[MAX_KPRINTF_BUF_SIZE];
 {
     char buf[MAX_KPRINTF_BUF_SIZE];

-    if (!fmt)
-        return;
-    char log_level = '0';

     char expanded_fmt[MAX_XFMT_SIZE];
 
     char expanded_fmt[MAX_XFMT_SIZE];
 

-    if (*fmt == '\x1b') {
-        log_level = *(++fmt);
-        fmt++;
-    }
-

     switch (log_level) {
     switch (log_level) {

-        case '0':
-            snprintf(expanded_fmt,
-                     MAX_XFMT_SIZE,
-                     "[%s] (%s) %s",
-                     "INFO",
-                     component,
-                     fmt);
-            break;
-        case '1':
+        case 1:

             // tty_set_theme(VGA_COLOR_BROWN, current_theme >> 12);
             // tty_set_theme(VGA_COLOR_BROWN, current_theme >> 12);

-            snprintf(expanded_fmt,
-                     MAX_XFMT_SIZE,
-                     "\033[6;0m[%s] (%s) %s\033[39;49m",
-                     "WARN",
-                     component,
-                     fmt);
+            ksnprintf(expanded_fmt,
+                      MAX_XFMT_SIZE,
+                      "\033[6;0mW %s: %s\033[39;49m",
+                      component,
+                      fmt);

             break;
             break;

-        case '2':
+        case 2:

             // tty_set_theme(VGA_COLOR_LIGHT_RED, current_theme >> 12);
             // tty_set_theme(VGA_COLOR_LIGHT_RED, current_theme >> 12);

-            snprintf(expanded_fmt,
-                     MAX_XFMT_SIZE,
-                     "\033[12;0m[%s] (%s) %s\033[39;49m",
-                     "EROR",
-                     component,
-                     fmt);
+            ksnprintf(expanded_fmt,
+                      MAX_XFMT_SIZE,
+                      "\033[12;0mE %s: %s\033[39;49m",
+                      component,
+                      fmt);

             break;
             break;

-        case '3':
+        case 3:

             // tty_set_theme(VGA_COLOR_LIGHT_BLUE, current_theme >> 12);
             // tty_set_theme(VGA_COLOR_LIGHT_BLUE, current_theme >> 12);

-            snprintf(expanded_fmt,
-                     MAX_XFMT_SIZE,
-                     "\033[9;0m[%s] (%s) %s\033[39;49m",
-                     "DEBG",
-                     component,
-                     fmt);
+            ksnprintf(expanded_fmt,
+                      MAX_XFMT_SIZE,
+                      "\033[9;0mD %s: %s\033[39;49m",
+                      component,
+                      fmt);

             break;
         default:
             break;
         default:

-            snprintf(expanded_fmt,
-                     MAX_XFMT_SIZE,
-                     "[%s] (%s) %s",
-                     "LOG",
-                     component,
-                     fmt);
+            ksnprintf(expanded_fmt, MAX_XFMT_SIZE, "- %s: %s", component, fmt);

             break;
     }
 
             break;
     }
 

-    __sprintf_internal(buf, expanded_fmt, MAX_KPRINTF_BUF_SIZE, args);
+    __ksprintf_internal(buf, expanded_fmt, MAX_KPRINTF_BUF_SIZE, args);

     console_write_str(buf);
 }
 
     console_write_str(buf);
 }
 

+void
+__kprintf(const char* component, const char* fmt, va_list args)
+{
+    if (!fmt)
+        return;
+    char log_level = '0';
+
+    if (*fmt == '\x1b') {
+        log_level = *(++fmt);
+        fmt++;
+    }
+
+    __kprintf_internal(component, log_level - '0', fmt, args);
+}
+

 void
 kprint_panic(const char* fmt, ...)
 {
 void
 kprint_panic(const char* fmt, ...)
 {


@@ -80,10 +76,28 @@ kprint_panic(const char* fmt, ...)
     tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_RED);
     tty_clear_line(24);
 
     tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_RED);
     tty_clear_line(24);
 

-    __sprintf_internal(buf, fmt, MAX_KPRINTF_BUF_SIZE, args);
+    __ksprintf_internal(buf, fmt, MAX_KPRINTF_BUF_SIZE, args);
+    tty_put_str_at(buf, 0, 24);
+
+    va_end(args);
+}
+
+void
+kprint_dbg(const char* fmt, ...)
+{
+    char buf[MAX_KPRINTF_BUF_SIZE];
+    va_list args;
+    va_start(args, fmt);
+
+    tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_MAGENTA);
+    tty_clear_line(24);
+
+    __ksprintf_internal(buf, fmt, MAX_KPRINTF_BUF_SIZE, args);

     tty_put_str_at(buf, 0, 24);
 
     va_end(args);
     tty_put_str_at(buf, 0, 24);
 
     va_end(args);

+
+    tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);

 }
 
 void
 }
 
 void


@@ -98,16 +112,21 @@ kprint_hex(const void* buffer, unsigned int size)
     ch_cache[0] = '|';
     ch_cache[1] = ' ';
     while (size) {
     ch_cache[0] = '|';
     ch_cache[1] = ' ';
     while (size) {

-        snprintf(buf, 64, " %.4p: ", ptr);
+        ksnprintf(buf, 64, " %.4p: ", ptr);

         console_write_str(buf);
         for (i = 0; i < 8 && size; i++, size--, ptr++) {
             unsigned char c = *(data + ptr) & 0xff;
             ch_cache[2 + i] = (32 <= c && c < 127) ? c : '.';
         console_write_str(buf);
         for (i = 0; i < 8 && size; i++, size--, ptr++) {
             unsigned char c = *(data + ptr) & 0xff;
             ch_cache[2 + i] = (32 <= c && c < 127) ? c : '.';

-            snprintf(buf, 64, "%.2x  ", c);
+            ksnprintf(buf, 64, "%.2x  ", c);

             console_write_str(buf);
         }
         ch_cache[2 + i] = '\0';
         console_write_str(ch_cache);
         console_write_char('\n');
     }
             console_write_str(buf);
         }
         ch_cache[2 + i] = '\0';
         console_write_str(ch_cache);
         console_write_char('\n');
     }

+}
+
+__DEFINE_LXSYSCALL3(void, syslog, int, level, const char*, fmt, va_list, args)
+{
+    __kprintf_internal("syslog", level, fmt, args);

 }
\ No newline at end of file
 }
\ No newline at end of file