Kernel/Debug - Fix normal log lines to be printed in one go

[tpg/acess2.git] / KernelLand / Kernel / debug.c

diff --git a/KernelLand/Kernel/debug.c b/KernelLand/Kernel/debug.c
index 1cea00c..ec39a16 100644 (file)
--- a/KernelLand/Kernel/debug.c
+++ b/KernelLand/Kernel/debug.c
@@ -4,23 +4,24 @@
  */
 #include <acess.h>
 #include <stdarg.h>
+#include <debug_hooks.h>
 
 #define        DEBUG_MAX_LINE_LEN      256
 #define        LOCK_DEBUG_OUTPUT       1       // Avoid interleaving of output lines?
-#define TRACE_TO_KTERM 0       // Send ENTER/DEBUG/LEAVE to debug?
+#define TRACE_TO_KTERM         0       // Send ENTER/DEBUG/LEAVE to debug?
 
 // === IMPORTS ===
-extern void    Threads_Dump(void);
 extern void    KernelPanic_SetMode(void);
 extern void    KernelPanic_PutChar(char Ch);
 extern void    IPStack_SendDebugText(const char *Text);
+extern void    VT_SetTerminal(int TerminalID);
 
 // === PROTOTYPES ===
 static void    Debug_Putchar(char ch);
 static void    Debug_Puts(int bUseKTerm, const char *Str);
 void   Debug_DbgOnlyFmt(const char *format, va_list args);
 void   Debug_FmtS(int bUseKTerm, const char *format, ...);
-void   Debug_Fmt(int bUseKTerm, const char *format, va_list args);
+bool   Debug_Fmt(int bUseKTerm, const char *format, va_list args);
 void   Debug_SetKTerminal(const char *File);
 
 // === GLOBALS ===
@@ -90,16 +91,18 @@ void Debug_DbgOnlyFmt(const char *format, va_list args)
        Debug_Fmt(0, format, args);
 }
 
-void Debug_Fmt(int bUseKTerm, const char *format, va_list args)
+bool Debug_Fmt(int bUseKTerm, const char *format, va_list args)
 {
        char    buf[DEBUG_MAX_LINE_LEN];
-//      int    len;
        buf[DEBUG_MAX_LINE_LEN-1] = 0;
-       /*len = */vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args);
-       //if( len < DEBUG_MAX_LINE )
-               // do something
+       size_t len = vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args);
        Debug_Puts(bUseKTerm, buf);
-       return ;
+       if( len > DEBUG_MAX_LINE_LEN-1 ) {
+               // do something
+               Debug_Puts(bUseKTerm, "[...]");
+               return false;
+       }
+       return true;
 }
 
 void Debug_FmtS(int bUseKTerm, const char *format, ...)
@@ -112,34 +115,41 @@ void Debug_FmtS(int bUseKTerm, const char *format, ...)
 
 void Debug_KernelPanic(void)
 {
-       #if LOCK_DEBUG_OUTPUT
-       SHORTREL(&glDebug_Lock);
-       #endif
+       // 5 nested panics? Fuck it
+       if( gbDebug_IsKPanic > 5 )
+               HALT_CPU();
        gbDebug_IsKPanic ++;
+       if( gbDebug_IsKPanic == 1 )
+       {
+               #if LOCK_DEBUG_OUTPUT
+               SHORTREL(&glDebug_Lock);
+               #endif
+               VT_SetTerminal(7);
+       }
        KernelPanic_SetMode();
 }
 
 /**
  * \fn void LogF(const char *Msg, ...)
  * \brief Raw debug log (no new line, no prefix)
+ * \return True if all of the provided text was printed
  */
-void LogF(const char *Fmt, ...)
+bool LogF(const char *Fmt, ...)
 {
-       va_list args;
-
        #if LOCK_DEBUG_OUTPUT
+       if(CPU_HAS_LOCK(&glDebug_Lock)) return true;
        SHORTLOCK(&glDebug_Lock);
        #endif
        
+       va_list args;
        va_start(args, Fmt);
-
-       Debug_Fmt(1, Fmt, args);
-
+       bool rv = Debug_Fmt(1, Fmt, args);
        va_end(args);
        
        #if LOCK_DEBUG_OUTPUT
        SHORTREL(&glDebug_Lock);
        #endif
+       return rv;
 }
 /**
  * \fn void Debug(const char *Msg, ...)
@@ -150,7 +160,8 @@ void Debug(const char *Fmt, ...)
        va_list args;
        
        #if LOCK_DEBUG_OUTPUT
-       if(!CPU_HAS_LOCK(&glDebug_Lock)) SHORTLOCK(&glDebug_Lock);
+       if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
+       SHORTLOCK(&glDebug_Lock);
        #endif
 
        Debug_Puts(0, "Debug: ");
@@ -168,6 +179,7 @@ void Debug(const char *Fmt, ...)
 void LogFV(const char *Fmt, va_list args)
 {
        #if LOCK_DEBUG_OUTPUT
+       if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
        SHORTLOCK(&glDebug_Lock);
        #endif
 
@@ -181,6 +193,7 @@ void LogFV(const char *Fmt, va_list args)
 void LogV(const char *Fmt, va_list args)
 {
        #if LOCK_DEBUG_OUTPUT
+       if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
        SHORTLOCK(&glDebug_Lock);
        #endif
 
@@ -209,6 +222,7 @@ void Warning(const char *Fmt, ...)
        va_list args;
        
        #if LOCK_DEBUG_OUTPUT
+       if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
        SHORTLOCK(&glDebug_Lock);
        #endif
        
@@ -235,17 +249,18 @@ void Panic(const char *Fmt, ...)
        
        Debug_KernelPanic();
        
+       Debug_Puts(1, "\x1b[31m");
        Debug_Puts(1, "Panic: ");
        va_start(args, Fmt);
        Debug_Fmt(1, Fmt, args);
        va_end(args);
-       Debug_Putchar('\r');
-       Debug_Putchar('\n');
+       Debug_Puts(1, "\x1b[0m\r\n");
 
-       Threads_Dump();
-       Heap_Dump();
+       Proc_PrintBacktrace();
+       //Threads_Dump();
+       //Heap_Dump();
 
-       for(;;) ;
+       HALT_CPU();
 }
 
 void Debug_SetKTerminal(const char *File)
@@ -270,6 +285,7 @@ void Debug_Enter(const char *FuncName, const char *ArgTypes, ...)
        tTID    tid = Threads_GetTID();
         
        #if LOCK_DEBUG_OUTPUT
+       if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
        SHORTLOCK(&glDebug_Lock);
        #endif
 
@@ -330,6 +346,7 @@ void Debug_Log(const char *FuncName, const char *Fmt, ...)
        tTID    tid = Threads_GetTID();
 
        #if LOCK_DEBUG_OUTPUT
+       if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
        SHORTLOCK(&glDebug_Lock);
        #endif
 
@@ -358,6 +375,7 @@ void Debug_Leave(const char *FuncName, char RetType, ...)
        tTID    tid = Threads_GetTID();
 
        #if LOCK_DEBUG_OUTPUT
+       if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
        SHORTLOCK(&glDebug_Lock);
        #endif